From ac3688c0d8a39d200f0556ad4b401d89b45ff04a Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Thu, 20 Mar 2008 15:08:51 +0000 Subject: [PATCH] make the Pen/Brush code backward compatible as discussed on wx-dev; marked the blocks of code to deprecate in future with FUTURE_WXWIN_COMPATIBILITY_3_0; add wxCHECK_MSG in all ports to block Get*() calls on invalid objects (as already is for all other refcounted objects and for most ports) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/msw/wx_vc7.sln | 375 +++++++++++++++++++++++++++++++++++- include/wx/brush.h | 54 +----- include/wx/cocoa/brush.h | 3 + include/wx/cocoa/pen.h | 4 +- include/wx/defs.h | 39 ++++ include/wx/dfb/brush.h | 3 + include/wx/dfb/pen.h | 4 +- include/wx/gtk/brush.h | 3 + include/wx/gtk/pen.h | 4 +- include/wx/gtk1/brush.h | 3 + include/wx/gtk1/pen.h | 4 +- include/wx/mac/carbon/pen.h | 4 +- include/wx/mgl/brush.h | 3 + include/wx/mgl/pen.h | 4 +- include/wx/msw/brush.h | 3 + include/wx/msw/pen.h | 4 +- include/wx/os2/brush.h | 3 + include/wx/os2/pen.h | 4 +- include/wx/palmos/brush.h | 3 + include/wx/palmos/pen.h | 4 +- include/wx/pen.h | 63 +----- include/wx/x11/brush.h | 3 + include/wx/x11/pen.h | 4 +- src/dfb/brush.cpp | 19 +- src/dfb/pen.cpp | 6 +- src/gtk/brush.cpp | 25 +-- src/gtk/pen.cpp | 16 +- src/gtk1/brush.cpp | 27 ++- src/gtk1/pen.cpp | 14 +- src/mac/carbon/brush.cpp | 9 +- src/mac/carbon/pen.cpp | 33 +++- src/mgl/brush.cpp | 27 ++- src/mgl/pen.cpp | 14 +- src/msw/brush.cpp | 9 +- src/msw/pen.cpp | 38 ++-- src/os2/brush.cpp | 14 ++ src/os2/pen.cpp | 4 +- src/x11/brush.cpp | 27 ++- src/x11/pen.cpp | 10 +- 39 files changed, 657 insertions(+), 233 deletions(-) diff --git a/build/msw/wx_vc7.sln b/build/msw/wx_vc7.sln index 5151fa3f91..465b7b109a 100644 --- a/build/msw/wx_vc7.sln +++ b/build/msw/wx_vc7.sln @@ -1,39 +1,75 @@ Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc7_wxregex.vcproj", "{7A1A5354-6DB4-53F1-B75C-FE909D796167}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc7_wxzlib.vcproj", "{DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wx_vc7_wxpng.vcproj", "{EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wx_vc7_wxjpeg.vcproj", "{3CA6563C-F480-52D4-AF05-D641E25A5DF2}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wx_vc7_wxtiff.vcproj", "{456F9EAD-4A96-59BD-A39A-75DAA25D517B}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wx_vc7_wxexpat.vcproj", "{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc7_wxscintilla.vcproj", "{A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc7_base.vcproj", "{79F1691B-08C4-55BB-985E-FDDB0BC8753C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wx_vc7_net.vcproj", "{48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wx_vc7_core.vcproj", "{552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wx_vc7_adv.vcproj", "{35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wx_vc7_media.vcproj", "{CD68AE51-BA90-5367-BB7D-F013E8E42AAF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wx_vc7_html.vcproj", "{C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_vc7_qa.vcproj", "{5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wx_vc7_xml.vcproj", "{B036100A-CEA0-5466-BE27-7E5B3687CAB8}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_vc7_xrc.vcproj", "{40DB525F-1EFF-56A4-8301-3AAD661135F3}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc7_aui.vcproj", "{0937D36F-9EAC-5D3D-B990-44B3F99BFC34}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc7_richtext.vcproj", "{52F16F53-E13D-55CA-AD64-ACB0274B0704}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_vc7_stc.vcproj", "{4B498696-42F2-5547-B159-87E4CAF436C1}" ProjectSection(ProjectDependencies) = postProject @@ -41,8 +77,346 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_vc7_stc.vcproj", EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc7_gl.vcproj", "{407F0D6F-2B2D-5774-B9D3-FA972A663072}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + DLL Debug = DLL Debug + DLL Release = DLL Release + DLL Universal Debug = DLL Universal Debug + DLL Universal Release = DLL Universal Release + Release = Release + Universal Debug = Universal Debug + Universal Release = Universal Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Debug.ActiveCfg = Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Debug.Build.0 = Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Debug.Build.0 = DLL Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Release.ActiveCfg = DLL Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Release.Build.0 = DLL Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Release.ActiveCfg = Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Release.Build.0 = Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Debug.Build.0 = Universal Debug|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Release.ActiveCfg = Universal Release|Win32 + {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Universal Release.Build.0 = Universal Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Debug.ActiveCfg = Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Debug.Build.0 = Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Debug.Build.0 = DLL Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Release.ActiveCfg = DLL Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Release.Build.0 = DLL Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Release.ActiveCfg = Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Release.Build.0 = Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Debug.Build.0 = Universal Debug|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Release.ActiveCfg = Universal Release|Win32 + {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Universal Release.Build.0 = Universal Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Debug.ActiveCfg = Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Debug.Build.0 = Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Debug.Build.0 = DLL Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Release.ActiveCfg = DLL Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Release.Build.0 = DLL Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Release.ActiveCfg = Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Release.Build.0 = Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Debug.Build.0 = Universal Debug|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Release.ActiveCfg = Universal Release|Win32 + {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Universal Release.Build.0 = Universal Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Debug.ActiveCfg = Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Debug.Build.0 = Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Debug.Build.0 = DLL Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Release.ActiveCfg = DLL Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Release.Build.0 = DLL Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Release.ActiveCfg = Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Release.Build.0 = Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Debug.Build.0 = Universal Debug|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Release.ActiveCfg = Universal Release|Win32 + {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Universal Release.Build.0 = Universal Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Debug.ActiveCfg = Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Debug.Build.0 = Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Debug.Build.0 = DLL Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Release.ActiveCfg = DLL Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Release.Build.0 = DLL Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Release.ActiveCfg = Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Release.Build.0 = Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Debug.Build.0 = Universal Debug|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Release.ActiveCfg = Universal Release|Win32 + {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Universal Release.Build.0 = Universal Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Debug.ActiveCfg = Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Debug.Build.0 = Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Debug.Build.0 = DLL Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Release.ActiveCfg = DLL Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Release.Build.0 = DLL Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release.ActiveCfg = Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release.Build.0 = Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Debug.Build.0 = Universal Debug|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Release.ActiveCfg = Universal Release|Win32 + {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Universal Release.Build.0 = Universal Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Debug.ActiveCfg = Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Debug.Build.0 = Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Debug.Build.0 = DLL Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Release.ActiveCfg = DLL Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Release.Build.0 = DLL Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Release.ActiveCfg = Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Release.Build.0 = Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Debug.Build.0 = Universal Debug|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Release.ActiveCfg = Universal Release|Win32 + {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Universal Release.Build.0 = Universal Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Debug.ActiveCfg = Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Debug.Build.0 = Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Debug.Build.0 = DLL Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Release.ActiveCfg = DLL Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Release.Build.0 = DLL Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Release.ActiveCfg = Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Release.Build.0 = Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Debug.Build.0 = Universal Debug|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Release.ActiveCfg = Universal Release|Win32 + {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Universal Release.Build.0 = Universal Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Debug.ActiveCfg = Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Debug.Build.0 = Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Debug.Build.0 = DLL Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Release.ActiveCfg = DLL Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Release.Build.0 = DLL Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Release.ActiveCfg = Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Release.Build.0 = Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Debug.Build.0 = Universal Debug|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Release.ActiveCfg = Universal Release|Win32 + {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Universal Release.Build.0 = Universal Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Debug.ActiveCfg = Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Debug.Build.0 = Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Debug.Build.0 = DLL Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Release.ActiveCfg = DLL Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Release.Build.0 = DLL Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Release.ActiveCfg = Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Release.Build.0 = Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Debug.Build.0 = Universal Debug|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Release.ActiveCfg = Universal Release|Win32 + {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Universal Release.Build.0 = Universal Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Debug.ActiveCfg = Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Debug.Build.0 = Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Debug.Build.0 = DLL Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Release.ActiveCfg = DLL Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Release.Build.0 = DLL Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Release.ActiveCfg = Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Release.Build.0 = Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Debug.Build.0 = Universal Debug|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Release.ActiveCfg = Universal Release|Win32 + {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Universal Release.Build.0 = Universal Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Debug.ActiveCfg = Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Debug.Build.0 = Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Debug.Build.0 = DLL Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Release.ActiveCfg = DLL Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Release.Build.0 = DLL Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Release.ActiveCfg = Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Release.Build.0 = Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Debug.Build.0 = Universal Debug|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Release.ActiveCfg = Universal Release|Win32 + {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Universal Release.Build.0 = Universal Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Debug.ActiveCfg = Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Debug.Build.0 = Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Debug.Build.0 = DLL Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Release.ActiveCfg = DLL Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Release.Build.0 = DLL Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Release.ActiveCfg = Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Release.Build.0 = Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Debug.Build.0 = Universal Debug|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Release.ActiveCfg = Universal Release|Win32 + {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Universal Release.Build.0 = Universal Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Debug.ActiveCfg = Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Debug.Build.0 = Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Debug.Build.0 = DLL Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Release.ActiveCfg = DLL Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Release.Build.0 = DLL Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Release.ActiveCfg = Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Release.Build.0 = Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Debug.Build.0 = Universal Debug|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Release.ActiveCfg = Universal Release|Win32 + {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Universal Release.Build.0 = Universal Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Debug.ActiveCfg = Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Debug.Build.0 = Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Debug.Build.0 = DLL Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Release.ActiveCfg = DLL Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Release.Build.0 = DLL Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Release.ActiveCfg = Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Release.Build.0 = Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Debug.Build.0 = Universal Debug|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Release.ActiveCfg = Universal Release|Win32 + {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Universal Release.Build.0 = Universal Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Debug.ActiveCfg = Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Debug.Build.0 = Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Debug.Build.0 = DLL Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Release.ActiveCfg = DLL Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Release.Build.0 = DLL Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Release.ActiveCfg = Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Release.Build.0 = Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Debug.Build.0 = Universal Debug|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Release.ActiveCfg = Universal Release|Win32 + {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Universal Release.Build.0 = Universal Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Debug.ActiveCfg = Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Debug.Build.0 = Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Debug.Build.0 = DLL Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Release.ActiveCfg = DLL Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Release.Build.0 = DLL Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Release.ActiveCfg = Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Release.Build.0 = Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Debug.Build.0 = Universal Debug|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Release.ActiveCfg = Universal Release|Win32 + {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Universal Release.Build.0 = Universal Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug.ActiveCfg = Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug.Build.0 = Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Debug.Build.0 = DLL Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Release.ActiveCfg = DLL Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Release.Build.0 = DLL Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Release.ActiveCfg = Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Release.Build.0 = Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Debug.Build.0 = Universal Debug|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Release.ActiveCfg = Universal Release|Win32 + {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Universal Release.Build.0 = Universal Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Debug.ActiveCfg = Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Debug.Build.0 = Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Debug.Build.0 = DLL Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Release.ActiveCfg = DLL Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Release.Build.0 = DLL Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Release.ActiveCfg = Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Release.Build.0 = Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Debug.Build.0 = Universal Debug|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Release.ActiveCfg = Universal Release|Win32 + {4B498696-42F2-5547-B159-87E4CAF436C1}.Universal Release.Build.0 = Universal Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Debug.ActiveCfg = Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Debug.Build.0 = Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Debug.ActiveCfg = DLL Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Debug.Build.0 = DLL Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Release.ActiveCfg = DLL Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Release.Build.0 = DLL Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Universal Release.Build.0 = DLL Universal Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Release.ActiveCfg = Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Release.Build.0 = Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Debug.ActiveCfg = Universal Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Debug.Build.0 = Universal Debug|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Release.ActiveCfg = Universal Release|Win32 + {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Universal Release.Build.0 = Universal Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution DLL Universal Release|Win32 = DLL Universal Release|Win32 DLL Universal Debug|Win32 = DLL Universal Debug|Win32 @@ -379,4 +753,3 @@ Global HideSolutionNode = FALSE EndGlobalSection EndGlobal - diff --git a/include/wx/brush.h b/include/wx/brush.h index d55ed5c3af..a999ffa2bd 100644 --- a/include/wx/brush.h +++ b/include/wx/brush.h @@ -20,22 +20,7 @@ // NOTE: these values cannot be combined together! enum wxBrushStyle { -#if WXWIN_COMPATIBILITY_2_8 - /* start of deprecated values */ - wxSOLID = 100, - wxTRANSPARENT = 106, - wxSTIPPLE_MASK_OPAQUE = 107, - wxSTIPPLE_MASK = 108, - wxSTIPPLE = 109, - wxBDIAGONAL_HATCH = 110, - wxCROSSDIAG_HATCH = 111, - wxFDIAGONAL_HATCH = 112, - wxCROSS_HATCH = 113, - wxHORIZONTAL_HATCH = 114, - wxVERTICAL_HATCH = 115, - wxFIRST_HATCH = wxBDIAGONAL_HATCH, - wxLAST_HATCH = wxVERTICAL_HATCH, - /* end of deprecated values */ + wxBRUSHSTYLE_INVALID = -1, wxBRUSHSTYLE_SOLID = wxSOLID, wxBRUSHSTYLE_TRANSPARENT = wxTRANSPARENT, @@ -50,38 +35,6 @@ enum wxBrushStyle wxBRUSHSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH, wxBRUSHSTYLE_FIRST_HATCH = wxFIRST_HATCH, wxBRUSHSTYLE_LAST_HATCH = wxLAST_HATCH, - wxBRUSHSTYLE_MAX -#else - wxBRUSHSTYLE_SOLID, - wxBRUSHSTYLE_TRANSPARENT, - - /* Brush Stippling. */ - - wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE, - /* mask is used for blitting monochrome using text fore and back ground colors */ - - wxBRUSHSTYLE_STIPPLE_MASK, - /* mask is used for masking areas in the stipple bitmap (TO DO) */ - - wxBRUSHSTYLE_STIPPLE, - /* drawn with a Pen, and without any Brush -- and it can be stippled. */ - - /* In wxWidgets < 2.6 use WX_HATCH macro */ - /* to verify these wx*_HATCH are in style */ - /* of wxBrush. In wxWidgets >= 2.6 use */ - /* wxBrush::IsHatch() instead. */ - wxBRUSHSTYLE_BDIAGONAL_HATCH, - wxBRUSHSTYLE_CROSSDIAG_HATCH, - wxBRUSHSTYLE_FDIAGONAL_HATCH, - wxBRUSHSTYLE_CROSS_HATCH, - wxBRUSHSTYLE_HORIZONTAL_HATCH, - wxBRUSHSTYLE_VERTICAL_HATCH, - - wxBRUSHSTYLE_FIRST_HATCH = wxBRUSHSTYLE_BDIAGONAL_HATCH, - wxBRUSHSTYLE_LAST_HATCH = wxBRUSHSTYLE_VERTICAL_HATCH, - - wxBRUSHSTYLE_MAX -#endif }; @@ -95,6 +48,11 @@ public: virtual bool IsHatch() const { return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); } + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif }; #if defined(__WXPALMOS__) diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index a3d41f8e98..eec16bc96d 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -30,6 +30,9 @@ 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 wxBitmap& stipple); virtual ~wxBrush(); diff --git a/include/wx/cocoa/pen.h b/include/wx/cocoa/pen.h index 223c2d43cc..c21325046c 100644 --- a/include/wx/cocoa/pen.h +++ b/include/wx/cocoa/pen.h @@ -26,8 +26,8 @@ class WXDLLEXPORT wxPen: public wxGDIObject public: wxPen(); wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif wxPen(const wxBitmap& stipple, int width); virtual ~wxPen(); diff --git a/include/wx/defs.h b/include/wx/defs.h index 1a7e0ff56e..521ed775a3 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -14,6 +14,11 @@ #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 */ /* ---------------------------------------------------------------------------- */ @@ -2099,6 +2104,40 @@ enum /* Also wxNORMAL for normal (non-italic text) */ wxITALIC, wxSLANT, + + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + /* + WARNING: the following styles are deprecated; use the wxBrushStyle, + wxPenStyle, wxPenCap, wxPenJoin enum values instead! + */ + + /* Pen styles */ + wxSOLID = 100, + wxDOT, + wxLONG_DASH, + wxSHORT_DASH, + wxDOT_DASH, + wxUSER_DASH, + + wxTRANSPARENT, + + /* Brush & Pen Stippling. Note that a stippled pen cannot be dashed!! */ + /* 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, /* 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, +#endif }; /* Logical ops */ diff --git a/include/wx/dfb/brush.h b/include/wx/dfb/brush.h index ece3093439..0d0a46c7a5 100644 --- a/include/wx/dfb/brush.h +++ b/include/wx/dfb/brush.h @@ -33,6 +33,9 @@ class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase public: wxBrush() {} wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush(const wxBitmap &stippleBitmap); bool operator==(const wxBrush& brush) const; diff --git a/include/wx/dfb/pen.h b/include/wx/dfb/pen.h index e70107a8b1..c9906dc2ae 100644 --- a/include/wx/dfb/pen.h +++ b/include/wx/dfb/pen.h @@ -33,8 +33,8 @@ class WXDLLIMPEXP_CORE wxPen: public wxPenBase public: wxPen() {} wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif wxPen(const wxBitmap& stipple, int width); diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index 977574e18f..190978fcd8 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -23,6 +23,9 @@ public: wxBrush() { } wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush( const wxBitmap &stippleBitmap ); virtual ~wxBrush(); diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h index f607a1be83..02baef3922 100644 --- a/include/wx/gtk/pen.h +++ b/include/wx/gtk/pen.h @@ -22,8 +22,8 @@ public: wxPen() { } wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif virtual ~wxPen(); diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h index a184c8f3b1..8a0001685d 100644 --- a/include/wx/gtk1/brush.h +++ b/include/wx/gtk1/brush.h @@ -33,6 +33,9 @@ public: wxBrush() { } wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush( const wxBitmap &stippleBitmap ); virtual ~wxBrush(); diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h index 7e85235346..01191d0324 100644 --- a/include/wx/gtk1/pen.h +++ b/include/wx/gtk1/pen.h @@ -38,8 +38,8 @@ public: wxPen() { } wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif virtual ~wxPen(); diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h index 9c3c365547..d354351519 100644 --- a/include/wx/mac/carbon/pen.h +++ b/include/wx/mac/carbon/pen.h @@ -22,8 +22,8 @@ class WXDLLEXPORT wxPen : public wxPenBase public: wxPen(); wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif wxPen(const wxBitmap& stipple, int width); diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index 318018f8cb..b48433e9d3 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -32,6 +32,9 @@ class WXDLLEXPORT wxBrush : public wxBrushBase public: wxBrush() {} wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush(const wxBitmap &stippleBitmap); bool operator==(const wxBrush& brush) const; diff --git a/include/wx/mgl/pen.h b/include/wx/mgl/pen.h index 880b6cf54c..0c1fcecfc9 100644 --- a/include/wx/mgl/pen.h +++ b/include/wx/mgl/pen.h @@ -32,8 +32,8 @@ class WXDLLEXPORT wxPen : public wxPenBase public: wxPen() {} wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif wxPen(const wxBitmap& stipple, int width); diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 621b0c28c7..646372e9c0 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -25,6 +25,9 @@ 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 wxBitmap& stipple); virtual ~wxBrush(); diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index 6f311678e5..1cd9b15b9f 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -24,8 +24,8 @@ class WXDLLEXPORT wxPen : public wxPenBase public: wxPen() { } wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif wxPen(const wxBitmap& stipple, int width); diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h index 0a0e64f080..ec7706c241 100644 --- a/include/wx/os2/brush.h +++ b/include/wx/os2/brush.h @@ -49,6 +49,9 @@ class WXDLLEXPORT wxBrush: public wxBrushBase public: wxBrush(); wxBrush(const wxColour& rCol, wxBrushStyle nStyle = wxBRUSHSTYLE_SOLID); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush(const wxBitmap& rStipple); virtual ~wxBrush(); diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index ec0bc73352..2a745cb584 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -64,8 +64,8 @@ public: ,int nWidth = 1 ,wxPenStyle nStyle = wxPENSTYLE_SOLID ); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif wxPen( const wxBitmap& rStipple diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h index 2c354a56bb..ba4bf15cc1 100644 --- a/include/wx/palmos/brush.h +++ b/include/wx/palmos/brush.h @@ -27,6 +27,9 @@ 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 wxBitmap& stipple); virtual ~wxBrush(); diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h index b6d99455bc..0afaf1c925 100644 --- a/include/wx/palmos/pen.h +++ b/include/wx/palmos/pen.h @@ -76,8 +76,8 @@ class WXDLLEXPORT wxPen : public wxPenBase public: wxPen(); wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif wxPen(const wxBitmap& stipple, int width); diff --git a/include/wx/pen.h b/include/wx/pen.h index 341530ef16..9f4f0d99a5 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -15,21 +15,9 @@ #include "wx/gdiobj.h" #include "wx/gdicmn.h" -#if WXWIN_COMPATIBILITY_2_8 -#include "wx/brush.h" // needed for some deprecated declarations -#endif - enum wxPenStyle { -#if WXWIN_COMPATIBILITY_2_8 - /* start of deprecated values */ - /* wxSOLID, wxTRANSPARENT, wxSTIPPLE are already defined in wxBrushStyle */ - wxDOT = 101, - wxLONG_DASH = 102, - wxSHORT_DASH = 103, - wxDOT_DASH = 104, - wxUSER_DASH = 105, - /* end of deprecated values */ + wxPENSTYLE_INVALID = -1, wxPENSTYLE_SOLID = wxSOLID, wxPENSTYLE_DOT = wxDOT, @@ -52,45 +40,7 @@ enum wxPenStyle wxPENSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH, wxPENSTYLE_FIRST_HATCH = wxFIRST_HATCH, - wxPENSTYLE_LAST_HATCH = wxLAST_HATCH, - - wxPENSTYLE_MAX -#else - wxPENSTYLE_SOLID, - wxPENSTYLE_DOT, - wxPENSTYLE_LONG_DASH, - wxPENSTYLE_SHORT_DASH, - wxPENSTYLE_DOT_DASH, - wxPENSTYLE_USER_DASH, - - wxPENSTYLE_TRANSPARENT, - - /* Pen Stippling. */ - wxPENSTYLE_STIPPLE_MASK_OPAQUE, - /* mask is used for blitting monochrome using text fore and back ground colors */ - - wxPENSTYLE_STIPPLE_MASK, - /* mask is used for masking areas in the stipple bitmap (TO DO) */ - - wxPENSTYLE_STIPPLE, - /* drawn with a Pen, and without any Brush -- and it can be stippled. */ - - /* In wxWidgets < 2.6 use WX_HATCH macro */ - /* to verify these wx*_HATCH are in style */ - /* of wxBrush. In wxWidgets >= 2.6 use */ - /* wxBrush::IsHatch() instead. */ - wxPENSTYLE_BDIAGONAL_HATCH, - wxPENSTYLE_CROSSDIAG_HATCH, - wxPENSTYLE_FDIAGONAL_HATCH, - wxPENSTYLE_CROSS_HATCH, - wxPENSTYLE_HORIZONTAL_HATCH, - wxPENSTYLE_VERTICAL_HATCH, - - wxPENSTYLE_FIRST_HATCH = wxPENSTYLE_BDIAGONAL_HATCH, - wxPENSTYLE_LAST_HATCH = wxPENSTYLE_VERTICAL_HATCH, - - wxPENSTYLE_MAX -#endif + wxPENSTYLE_LAST_HATCH = wxLAST_HATCH }; enum wxPenJoin @@ -135,8 +85,8 @@ public: virtual int GetWidth() const = 0; virtual int GetDashes(wxDash **ptr) const = 0; -#if WXWIN_COMPATIBILITY_2_8 - void SetStyle(wxBrushStyle style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) { SetStyle((wxPenStyle)style); } #endif }; @@ -167,6 +117,11 @@ class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase { public: wxPen *FindOrCreatePen(const wxColour& colour, int width, wxPenStyle style); + +#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*) ); diff --git a/include/wx/x11/brush.h b/include/wx/x11/brush.h index 49586ad0ce..b2e6627651 100644 --- a/include/wx/x11/brush.h +++ b/include/wx/x11/brush.h @@ -32,6 +32,9 @@ public: wxBrush() { } wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush( const wxBitmap &stippleBitmap ); virtual ~wxBrush(); diff --git a/include/wx/x11/pen.h b/include/wx/x11/pen.h index a6b350f21c..df8b0b67cf 100644 --- a/include/wx/x11/pen.h +++ b/include/wx/x11/pen.h @@ -35,8 +35,8 @@ public: wxPen() { } wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( wxPen(const wxColour& col, int width, wxBrushStyle style) ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); #endif wxPen( const wxBitmap &stipple, int width ); diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp index 51a295f997..efbd60cbbc 100644 --- a/src/dfb/brush.cpp +++ b/src/dfb/brush.cpp @@ -69,6 +69,13 @@ wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style) m_refData = new wxBrushRefData(colour, 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 &stippleBitmap) { wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") ); @@ -84,22 +91,14 @@ bool wxBrush::operator==(const wxBrush& brush) const wxBrushStyle wxBrush::GetStyle() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return 0; - } + wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour& wxBrush::GetColour() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return wxNullColour; - } + wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") ); return M_BRUSHDATA->m_colour; } diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp index 15e685dc02..c71488b587 100644 --- a/src/dfb/pen.cpp +++ b/src/dfb/pen.cpp @@ -68,10 +68,12 @@ wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style) m_refData = new wxPenRefData(colour, style); } -wxPen::wxPen(const wxColour& col, int width, wxBrushStyle style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& col, int width, int style) { m_refData = new wxPenRefData(col, (wxPenStyle)style); } +#endif wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width)) { @@ -169,7 +171,7 @@ wxPenJoin wxPen::GetJoin() const wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_MAX, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } diff --git a/src/gtk/brush.cpp b/src/gtk/brush.cpp index a57855a31e..a1a29fc190 100644 --- a/src/gtk/brush.cpp +++ b/src/gtk/brush.cpp @@ -61,6 +61,13 @@ wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style ) m_refData = new wxBrushRefData(colour, 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 &stippleBitmap ) { wxBrushStyle style = wxBRUSHSTYLE_STIPPLE; @@ -97,33 +104,21 @@ bool wxBrush::operator==(const wxBrush& brush) const wxBrushStyle wxBrush::GetStyle() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return wxBRUSHSTYLE_MAX; - } + wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour &wxBrush::GetColour() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return wxNullColour; - } + wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return &wxNullBitmap; - } + wxCHECK_MSG( Ok(), NULL, _T("invalid brush") ); return &M_BRUSHDATA->m_stipple; } diff --git a/src/gtk/pen.cpp b/src/gtk/pen.cpp index f7412d49b4..2e38df095b 100644 --- a/src/gtk/pen.cpp +++ b/src/gtk/pen.cpp @@ -96,8 +96,8 @@ wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style ) M_PENDATA->m_colour = colour; } -#if WXWIN_COMPATIBILITY_2_8 -wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) { m_refData = new wxPenRefData(); M_PENDATA->m_width = width; @@ -182,17 +182,23 @@ void wxPen::SetWidth( int width ) int wxPen::GetDashes( wxDash **ptr ) const { - *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); - return (M_PENDATA ? M_PENDATA->m_countDashes : 0); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + *ptr = (wxDash*)M_PENDATA->m_dash; + return M_PENDATA->m_countDashes; } int wxPen::GetDashCount() const { + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + return (M_PENDATA->m_countDashes); } wxDash* wxPen::GetDash() const { + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + return (wxDash*)M_PENDATA->m_dash; } @@ -212,7 +218,7 @@ wxPenJoin wxPen::GetJoin() const wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_MAX, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } diff --git a/src/gtk1/brush.cpp b/src/gtk1/brush.cpp index 908cfd933c..d574a9ca0d 100644 --- a/src/gtk1/brush.cpp +++ b/src/gtk1/brush.cpp @@ -63,6 +63,15 @@ wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style ) M_BRUSHDATA->m_colour = colour; } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxBrush::wxBrush(const wxColour& col, int style) +{ + m_refData = new wxBrushRefData; + M_BRUSHDATA->m_style = (wxBrushStyle)style; + M_BRUSHDATA->m_colour = colour; +} +#endif + wxBrush::wxBrush( const wxBitmap &stippleBitmap ) { m_refData = new wxBrushRefData(); @@ -102,33 +111,21 @@ bool wxBrush::operator == ( const wxBrush& brush ) const wxBrushStyle wxBrush::GetStyle() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return 0; - } + wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour &wxBrush::GetColour() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return wxNullColour; - } + wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return &wxNullBitmap; - } + wxCHECK_MSG( Ok(), NULL, _T("invalid brush") ); return &M_BRUSHDATA->m_stipple; } diff --git a/src/gtk1/pen.cpp b/src/gtk1/pen.cpp index bdb392768e..0dfda413c1 100644 --- a/src/gtk1/pen.cpp +++ b/src/gtk1/pen.cpp @@ -96,13 +96,15 @@ wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style ) M_PENDATA->m_colour = colour; } -wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) { m_refData = new wxPenRefData(); M_PENDATA->m_width = width; M_PENDATA->m_style = (wxPenStyle)style; M_PENDATA->m_colour = colour; } +#endif wxPen::~wxPen() { @@ -180,17 +182,23 @@ void wxPen::SetWidth( int width ) int wxPen::GetDashes( wxDash **ptr ) const { - *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); - return (M_PENDATA ? M_PENDATA->m_countDashes : 0); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + *ptr = (wxDash*)M_PENDATA->m_dash; + return M_PENDATA->m_countDashes; } int wxPen::GetDashCount() const { + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + return (M_PENDATA->m_countDashes); } wxDash* wxPen::GetDash() const { + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + return (wxDash*)M_PENDATA->m_dash; } diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index 14a75ca37e..37f2043f65 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -100,6 +100,13 @@ wxBrush::wxBrush(const wxColour& col, wxBrushStyle 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 ); @@ -140,7 +147,7 @@ const wxColour& wxBrush::GetColour() const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_MAX, _T("invalid brush") ); + wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") ); return M_BRUSHDATA->GetStyle(); } diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp index b1e1cccb01..8d6461dd97 100644 --- a/src/mac/carbon/pen.cpp +++ b/src/mac/carbon/pen.cpp @@ -112,7 +112,8 @@ wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style) RealizeResource(); } -wxPen::wxPen(const wxColour& col, int Width, wxBrushStyle Style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& col, int Width, int Style) { m_refData = new wxPenRefData; @@ -126,6 +127,7 @@ wxPen::wxPen(const wxColour& col, int Width, wxBrushStyle Style) RealizeResource(); } +#endif wxPen::wxPen(const wxBitmap& stipple, int Width) { @@ -162,37 +164,52 @@ bool wxPen::operator==(const wxPen& pen) const wxColour& wxPen::GetColour() const { - return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); + wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + + return M_PENDATA->m_colour; } int wxPen::GetWidth() const { - return (M_PENDATA ? M_PENDATA->m_width : 0); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + return M_PENDATA->m_width; } wxPenStyle wxPen::GetStyle() const { - return (M_PENDATA ? M_PENDATA->m_style : wxPENSTYLE_SOLID); + wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + + return M_PENDATA->m_style; } wxPenJoin wxPen::GetJoin() const { - return (M_PENDATA ? M_PENDATA->m_join : wxJOIN_INVALID); + wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + + return M_PENDATA->m_join; } wxPenCap wxPen::GetCap() const { - return (M_PENDATA ? M_PENDATA->m_cap : wxCAP_INVALID); + wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + + return M_PENDATA->m_cap; } int wxPen::GetDashes(wxDash **ptr) const { - *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + *ptr = M_PENDATA->m_dash; + return M_PENDATA->m_nbDash; } wxBitmap *wxPen::GetStipple() const { - return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + + return &M_PENDATA->m_stipple; } void wxPen::Unshare() diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index fd6f1c3847..7735469cd1 100644 --- a/src/mgl/brush.cpp +++ b/src/mgl/brush.cpp @@ -133,6 +133,15 @@ wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style) M_BRUSHDATA->m_colour = colour; } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxBrush::wxBrush(const wxColour& col, int style) +{ + m_refData = new wxBrushRefData; + M_BRUSHDATA->m_style = (wxBrushStyle)style; + M_BRUSHDATA->m_colour = colour; +} +#endif + wxBrush::wxBrush(const wxBitmap &stippleBitmap) { wxCHECK_RET( stippleBitmap.Ok(), _T("invalid bitmap") ); @@ -168,33 +177,21 @@ bool wxBrush::operator != (const wxBrush& brush) const wxBrushStyle wxBrush::GetStyle() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return 0; - } + wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour &wxBrush::GetColour() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return wxNullColour; - } + wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return &wxNullBitmap; - } + wxCHECK_MSG( Ok(), NULL, _T("invalid brush") ); return &M_BRUSHDATA->m_stipple; } diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index 9ba288a240..64fdb7bcef 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -110,13 +110,15 @@ wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style) M_PENDATA->m_colour = colour; } -wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) { m_refData = new wxPenRefData(); M_PENDATA->m_width = width; M_PENDATA->m_style = (wxPenStyle)style; M_PENDATA->m_colour = colour; } +#endif wxPen::wxPen(const wxBitmap& stipple, int width) { @@ -201,17 +203,23 @@ void wxPen::SetWidth(int width) int wxPen::GetDashes(wxDash **ptr) const { - *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); - return (M_PENDATA ? M_PENDATA->m_countDashes : 0); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + *ptr = (wxDash*)M_PENDATA->m_dash; + return M_PENDATA->m_countDashes; } int wxPen::GetDashCount() const { + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + return (M_PENDATA->m_countDashes); } wxDash* wxPen::GetDash() const { + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + return (wxDash*)M_PENDATA->m_dash; } diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index 95119e26b6..f71e16746e 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -233,6 +233,13 @@ wxBrush::wxBrush(const wxColour& col, wxBrushStyle 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); @@ -277,7 +284,7 @@ wxColour wxBrush::GetColour() const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_MAX, _T("invalid brush") ); + wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") ); return M_BRUSHDATA->GetStyle(); } diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index be20ac765d..ae1b3d63b8 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -435,12 +435,12 @@ wxPen::wxPen(const wxColour& col, int width, wxPenStyle style) m_refData = new wxPenRefData(col, width, style); } -/* error: `wxBrushStyle' has not been declared -wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle 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) { @@ -542,36 +542,42 @@ void wxPen::SetCap(wxPenCap cap) wxColour& wxPen::GetColour() const { - return m_refData ? M_PENDATA->GetColour() : wxNullColour; + wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + + return M_PENDATA->GetColour(); } int wxPen::GetWidth() const { - return m_refData ? M_PENDATA->GetWidth() : 0; + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + return M_PENDATA->GetWidth(); } wxPenStyle wxPen::GetStyle() const { - return m_refData ? M_PENDATA->GetStyle() : wxPENSTYLE_MAX; + wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + + return M_PENDATA->GetStyle(); } wxPenJoin wxPen::GetJoin() const { - return m_refData ? M_PENDATA->GetJoin() : wxJOIN_INVALID; + wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + + return M_PENDATA->GetJoin(); } wxPenCap wxPen::GetCap() const { - return m_refData ? M_PENDATA->GetCap() : wxCAP_INVALID; + wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + + return M_PENDATA->GetCap(); } int wxPen::GetDashes(wxDash** ptr) const { - if ( !m_refData ) - { - *ptr = NULL; - return 0; - } + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); *ptr = M_PENDATA->GetDash(); return M_PENDATA->GetDashCount(); @@ -579,15 +585,21 @@ int wxPen::GetDashes(wxDash** ptr) const wxDash* wxPen::GetDash() const { + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + return m_refData ? M_PENDATA->GetDash() : NULL; } int wxPen::GetDashCount() const { + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + return m_refData ? M_PENDATA->GetDashCount() : 0; } wxBitmap* wxPen::GetStipple() const { + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + return m_refData ? M_PENDATA->GetStipple() : NULL; } diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp index 73ac78a709..51613dd367 100644 --- a/src/os2/brush.cpp +++ b/src/os2/brush.cpp @@ -73,6 +73,20 @@ wxBrush::wxBrush( RealizeResource(); } // end of wxBrush::wxBrush +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxBrush::wxBrush(const wxColour& col, int style) +{ + m_refData = new wxBrushRefData; + + M_BRUSHDATA->m_vColour = col; + M_BRUSHDATA->m_nStyle = (wxBrushStyle)style; + M_BRUSHDATA->m_hBrush = 0; + memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE)); + + RealizeResource(); +} +#endif + wxBrush::wxBrush(const wxBitmap& rStipple) { m_refData = new wxBrushRefData; diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp index 39a9e5d6c4..5c3ed2e24d 100644 --- a/src/os2/pen.cpp +++ b/src/os2/pen.cpp @@ -86,7 +86,8 @@ wxPen::wxPen( RealizeResource(); } // end of wxPen::wxPen -wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) { m_refData = new wxPenRefData; @@ -99,6 +100,7 @@ wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style) RealizeResource(); } +#endif wxPen::wxPen( const wxBitmap& rStipple diff --git a/src/x11/brush.cpp b/src/x11/brush.cpp index 4a45842abf..e2628de2b3 100644 --- a/src/x11/brush.cpp +++ b/src/x11/brush.cpp @@ -64,6 +64,15 @@ wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style ) M_BRUSHDATA->m_colour = colour; } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxBrush::wxBrush(const wxColour& col, int style) +{ + m_refData = new wxBrushRefData; + M_BRUSHDATA->m_style = (wxBrushStyle)style; + M_BRUSHDATA->m_colour = colour; +} +#endif + wxBrush::wxBrush( const wxBitmap &stippleBitmap ) { m_refData = new wxBrushRefData(); @@ -103,33 +112,21 @@ bool wxBrush::operator == ( const wxBrush& brush ) const wxBrushStyle wxBrush::GetStyle() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return 0; - } + wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") ); return M_BRUSHDATA->m_style; } wxColour &wxBrush::GetColour() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return wxNullColour; - } + wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - if (m_refData == NULL) - { - wxFAIL_MSG( wxT("invalid brush") ); - return &wxNullBitmap; - } + wxCHECK_MSG( Ok(), NULL, _T("invalid brush") ); return &M_BRUSHDATA->m_stipple; } diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp index 31e4087bc2..1c274eb754 100644 --- a/src/x11/pen.cpp +++ b/src/x11/pen.cpp @@ -86,13 +86,15 @@ wxPen::wxPen( const wxColour &colour, int width, wxPenStyle style ) M_PENDATA->m_colour = colour; } -wxPen::wxPen(const wxColour& colour, int width, wxBrushStyle style) +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) { m_refData = new wxPenRefData(); M_PENDATA->m_width = width; M_PENDATA->m_style = (wxPenStyle)style; M_PENDATA->m_colour = colour; } +#endif wxPen::~wxPen() { @@ -177,8 +179,10 @@ void wxPen::SetWidth( int width ) int wxPen::GetDashes( wxDash **ptr ) const { - *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); - return (M_PENDATA ? M_PENDATA->m_countDashes : 0); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + *ptr = (wxDash*)M_PENDATA->m_dash; + return M_PENDATA->m_countDashes; } int wxPen::GetDashCount() const -- 2.45.2