diff --git a/contrib/include/wx/xrc/xh_all.h b/contrib/include/wx/xrc/xh_all.h index 2ac1db392c..51ccbf3533 100644 --- a/contrib/include/wx/xrc/xh_all.h +++ b/contrib/include/wx/xrc/xh_all.h @@ -47,5 +47,7 @@ #include "wx/xrc/xh_gdctl.h" #include "wx/xrc/xh_frame.h" #include "wx/xrc/xh_scwin.h" +#include "wx/xrc/xh_split.h" +#include "wx/xrc/xh_wizrd.h" #endif // _WX_XMLRES_H_ diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index ca0f650ca8..25eccb7df1 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -24,7 +24,7 @@ HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \ xh_radbt.h xh_radbx.h xh_sizer.h xh_slidr.h xh_spin.h xh_stbmp.h \ xh_sttxt.h xh_text.h xh_listb.h xml.h xmlres.h xh_toolb.h \ xh_bmpbt.h xh_cald.h xh_listc.h xh_scrol.h xh_stbox.h xh_tree.h \ - xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h xh_scwin.h + xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h xh_scwin.h xh_split.h xh_wizrd.h OBJECTS=$(EXPAT_OBJECTS) \ xml.o xmlres.o xmlrsall.o \ @@ -33,7 +33,7 @@ OBJECTS=$(EXPAT_OBJECTS) \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \ - xh_frame.o xh_gdctl.o xh_scwin.o + xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o DEPFILES=$(OBJECTS:.o=.d) APPEXTRADEFS=-I$(top_srcdir)/contrib/include $(EXPAT_DEFS) diff --git a/contrib/src/xrc/XrcVC.dsp b/contrib/src/xrc/XrcVC.dsp index 174c339711..d0b782997d 100644 --- a/contrib/src/xrc/XrcVC.dsp +++ b/contrib/src/xrc/XrcVC.dsp @@ -228,6 +228,14 @@ SOURCE=.\xh_tree.cpp # End Source File # Begin Source File +SOURCE=.\xh_split.cpp +# End Source File +# Begin Source File + +SOURCE=.\xh_wizrd.cpp +# End Source File +# Begin Source File + SOURCE=.\xh_unkwn.cpp # End Source File # Begin Source File diff --git a/contrib/src/xrc/makefile.b32 b/contrib/src/xrc/makefile.b32 index 2024abb133..af44b29d59 100644 --- a/contrib/src/xrc/makefile.b32 +++ b/contrib/src/xrc/makefile.b32 @@ -27,7 +27,7 @@ OBJECTS=$(EXPAT_OBJECTS) \ xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj \ xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj \ xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj \ - xh_tree.obj xh_unkwn.obj xh_frame.obj xh_gdctl.obj xh_scwin.obj + xh_tree.obj xh_unkwn.obj xh_frame.obj xh_gdctl.obj xh_scwin.obj xh_split.obj xh_wizrd.obj !include $(WXDIR)\src\makelib.b32 diff --git a/contrib/src/xrc/makefile.g95 b/contrib/src/xrc/makefile.g95 index 00b31580dc..a3e9d80636 100644 --- a/contrib/src/xrc/makefile.g95 +++ b/contrib/src/xrc/makefile.g95 @@ -28,7 +28,7 @@ OBJECTS= $(XMLPARSEDIR_OBJECTS) $(XMLTOKDIR_OBJECTS) \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \ - xh_frame.o xh_gdctl.o xh_scwin.o + xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o include $(WXDIR)/src/makelib.g95 diff --git a/contrib/src/xrc/makefile.vc b/contrib/src/xrc/makefile.vc index 6065d42e49..a3cfa52369 100644 --- a/contrib/src/xrc/makefile.vc +++ b/contrib/src/xrc/makefile.vc @@ -57,7 +57,7 @@ OBJECTS=$(EXPAT_OBJS) \ $(D)\xh_text.obj $(D)\xh_listb.obj $(D)\xh_toolb.obj \ $(D)\xh_bmpbt.obj $(D)\xh_cald.obj $(D)\xh_listc.obj $(D)\xh_scrol.obj \ $(D)\xh_stbox.obj $(D)\xh_tree.obj $(D)\xh_stlin.obj $(D)\xh_bmp.obj \ - $(D)\xh_unkwn.obj $(D)\xh_gdctl.obj $(D)\xh_scwin.obj + $(D)\xh_unkwn.obj $(D)\xh_gdctl.obj $(D)\xh_scwin.obj $(D)\xh_split.obj $(D)\xh_wizrd.obj !include $(WXDIR)\src\makelib.vc diff --git a/contrib/src/xrc/makefile.wat b/contrib/src/xrc/makefile.wat index 3d489d8aea..a128327d0a 100644 --- a/contrib/src/xrc/makefile.wat +++ b/contrib/src/xrc/makefile.wat @@ -47,6 +47,7 @@ OBJECTS=& $(OUTPUTDIR)\xh_unkwn.obj & $(OUTPUTDIR)\xh_frame.obj & $(OUTPUTDIR)\xh_scwin.obj & - $(OUTPUTDIR)\xh_split.obj + $(OUTPUTDIR)\xh_split.obj & + $(OUTPUTDIR)\xh_wizrd.obj !include $(WXDIR)\src\makelib.wat diff --git a/contrib/src/xrc/xh_sizer.cpp b/contrib/src/xrc/xh_sizer.cpp index fa5cbdccfb..7cf5e4fec0 100644 --- a/contrib/src/xrc/xh_sizer.cpp +++ b/contrib/src/xrc/xh_sizer.cpp @@ -139,6 +139,8 @@ wxObject *wxSizerXmlHandler::DoCreateResource() wxCHECK_MSG(m_parentSizer != NULL || ((IsOfClass(parentNode, wxT("wxPanel")) || + IsOfClass(parentNode, wxT("wxWizardPage")) || + IsOfClass(parentNode, wxT("wxWizardPageSimple")) || IsOfClass(parentNode, wxT("wxFrame")) || IsOfClass(parentNode, wxT("wxDialog"))) && parentNode->GetType() == wxXML_ELEMENT_NODE), NULL, diff --git a/contrib/src/xrc/xmlrsall.cpp b/contrib/src/xrc/xmlrsall.cpp index 5d933f9490..7de3f4f9cb 100644 --- a/contrib/src/xrc/xmlrsall.cpp +++ b/contrib/src/xrc/xmlrsall.cpp @@ -95,4 +95,8 @@ void wxXmlResource::InitAllHandlers() #endif AddHandler(new wxFrameXmlHandler); AddHandler(new wxScrolledWindowXmlHandler); + AddHandler(new wxSplitterWindowXmlHandler); +#if wxUSE_WIZARDDLG + AddHandler(new wxWizardXmlHandler); +#endif } diff --git a/docs/changes.txt b/docs/changes.txt index 5bddae6fc2..5fe796477a 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -112,6 +112,8 @@ All (GUI): wxMessageOutput::Set(new wxMessageOutputLog); to your program (you will need to #include ) +- Backported XRC handlers for wxSplitterWindow and wxWizard. + wxMSW: ! build system changed: setup.h is not a static file in include/wx any more diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm index f75ce4688e..d40cb8f4e7 100644 --- a/docs/html/faqgen.htm +++ b/docs/html/faqgen.htm @@ -40,6 +40,7 @@ See also top-level FAQ page.
  • What is wxBase?
  • What is wxUniversal?
  • What about Java?
    • +
  • What about .NET/Mono?
  • How can I help the project?
    • @@ -269,6 +270,40 @@ The Java honeymoon period is over :-) and people are realising that it cannot meet all their cross-platform development needs. We don't anticipate a major threat from Java, and the level of interest in wxWindows is as high as ever.

    +

    What about .NET/Mono?

    + +Microsoft is spending a lot on promoting the .NET initiative, which +is a set of languages, APIs and web service components for Windows. +Ximian has started an open source version of .NET, mostly for Linux. +C# is Microsoft's alternative to Java, supporting 'managed code', +garbage collection and various other Java-like language features.

    + +Although this may be attractive to some developers, there +is a variety of reasons why the .NET/Mono combination is unlikely +to make wxWindows redundant. Please note that the following comments +are Julian Smart's opinions.

    + +

      +
    1. Not everyone wants or needs net services. +
    2. C++ will be used for a long time to come; compared with C++, C# is a recent development and its future is not certain. +
    3. Mono Forms may only target Winelib (at least to begin with), so the end result is not as native as +wxWindows (I'm aware there is GTK# for use with the C# language). +
    4. C# is usually byte-compiled and therefore slower. Plus, .NET adds a layer of overhead to the client computer +that wxWindows does not require. +
    5. Mono hasn't proven its long-term viability yet (it's a complex system of components); wxWindows is ready now. +
    6. You may not wish to buy into Microsoft marketing spin and APIs. +
    7. .NET might never be implemented on some platforms, especially Mac and embedded variants of Linux. +
    8. wxPython and other language variants provide further reasons for wxWindows to continue. +
    9. The same issue exists for Qt: if Qt sales remain strong, it's a good indication that +the market for a C++-based approach is still there. (Either that, or everyone's turning to wxWindows!) +
    + +There is nothing to stop folk from developing a C# version of the wxWindows API; +we already have bindings to Python, Perl, JavaScript, Lua, Basic, and Eiffel. +Update: a wx.NET project is now in progress. + +

    +

    How can I help the project?

    Please check out the Community pages, diff --git a/docs/html/faqmac.htm b/docs/html/faqmac.htm index 074f50dd6c..4896e7e599 100644 --- a/docs/html/faqmac.htm +++ b/docs/html/faqmac.htm @@ -38,6 +38,7 @@ See also top-level FAQ page.
  • What are the smart preprocessing errors with the Apple Developer Tools?
  • How does wxMac support the standard Apple About menu item and Help menu?
  • How do I add an icon to my application?
    • +
  • How can I easily switch between different versions of wxWindows in CodeWarrior?
    • @@ -214,6 +215,22 @@ your project and in the CodeWarrior Settings add a check mark under Linker:Outpu Flags/Finder Flags/Has Custom Icon.

    +

    How can I easily switch between different versions of wxWindows in CodeWarrior?

    + +Sometimes you want to test your application against different versions +of wxWindows, for example a stable version of wxWindows versus a development version. +The easiest way to do this is to create a symbolic path.

    + +Under Edit-Preferences in General:Source Trees, type a name (for example WXWIN) +and choose a path for it. Now reselect your include and lib paths for a last +time, in the settings for each configuration, but make them relative to the symbolic name. +

    + +From now on you can just change the path associated with the symbolic name. + +

    + + diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm index 346e9de28d..7cf90ae7ec 100644 --- a/docs/html/faqmsw.htm +++ b/docs/html/faqmsw.htm @@ -43,6 +43,7 @@ See also top-level FAQ page.

  • How do you use VC++'s memory leak checking instead of that in wxWindows?
  • Why are menu hotkeys or shortcuts not working in my application?
  • Why can I not write to the HKLM part of the registry with wxRegConfig?
    • +
  • Is MS Active Accessibility supported?
    • @@ -113,6 +114,23 @@ the following: </assembly> +If you want to add it to your application permanently, +you can also include it in your .rc file using this +line:

    + +

    +  1 24 "winxp.manifest"
+
    + +In wxWindows 2.5, this will be in the wx/msw/wx.rc and +so will happen automatically so long as you include wx.rc +in your own .rc file.

    + +For an explanation of this syntax, please see +this +article. +

    +

    What compilers are supported?

    Please see the wxWindows 2 for Windows install.txt file for up-to-date information, but @@ -198,25 +216,26 @@ You can compile wxWindows as a DLL (see above, VC++/BC++ only at present). You s compile your programs for release using non-debugging and space-optimisation options, but take with VC++ 5/6 space optimisation: it can sometimes cause problems.

    -Statically-linked wxWindows 2 programs are smaller than wxWindows 1.xx programs, because of the way -wxWindows 2 has been designed to reduce dependencies between classes, and other -techniques. The linker will not include code from the library that is not (directly or -indirectly) referenced -by your application. So for example, the 'minimal' sample is less than 500KB using VC++ 6 -(note that this figure may be greater for the latest version of wxWindows).

    - If you want to distribute really small executables, you can use Petite by Ian Luck. This nifty utility compresses Windows executables by around 50%, so your 500KB executable will shrink to a mere 250KB. With this sort of size, there is reduced incentive to -use DLLs. Another good compression tool is UPX. +use DLLs. Another good compression tool (probably better than Petite) is UPX.

    Please do not be surprised if MinGW produces a statically-linked minimal executable of 1 MB. Firstly, gcc produces larger executables than some compilers. Secondly, this figure will include most of the overhead of wxWindows, so as your application becomes more -complex, the overhead becomes proportionaly less significant. And thirdly, trading executable compactness -for the enormous increase in productivity you get with wxWindows is almost always well worth it. +complex, the overhead becomes proportionally less significant. And thirdly, trading executable compactness +for the enormous increase in productivity you get with wxWindows is almost always well worth it.

    + +If you have a really large executable compiled with MinGW (for example 20MB) then +you need to configure wxWindows to compile without debugging information: see +docs/msw/install.txt for details. You may find that using configure instead +of makefile.g95 is easier, particularly since you can maintain debug and +release versions of the library simultaneously, in different directories. +Also, run 'strip' after linking to remove all traces of debug info. +

    Is wxWindows compatible with MFC?

    @@ -464,6 +483,13 @@ bool myGlobalConfig::Write (const wxString& key, const wxString& value) } +

    Is MS Active Accessibility supported?

    + +This is being worked on. Please see this page +for the current status. + +

    + diff --git a/docs/html/i18n.htm b/docs/html/i18n.htm index a82dd9277c..25972fd943 100644 --- a/docs/html/i18n.htm +++ b/docs/html/i18n.htm @@ -38,7 +38,7 @@ your language if it is not mentioned here (or to help with one which already is -- it is quite helpful to have several translators for one language at least for proof reading). -

    +
    Available translations
    @@ -64,12 +64,26 @@ translations as of wxWindows 2.3. - Chinese + Catalan + Done + Pau Bosch i Crespo + + + + + Chinese (simplified) Done mrfx + + Chinese (traditional) + Done + pal.tw + + + Czech Done @@ -157,8 +171,9 @@ translations as of wxWindows 2.3. Polish - Not yet - Piotr Mackowiak + Done + Piotr Mackowiak, + Janusz Piwowarski @@ -201,12 +216,19 @@ translations as of wxWindows 2.3. Hakki Dogusan + + Ukrainian + Ok + Eugene Manko> + + +
    -
    +
    How to help
    @@ -259,5 +281,3 @@ any comments/suggestions. - - diff --git a/docs/html/platform.htm b/docs/html/platform.htm index 46ef6cbc89..440186e190 100644 --- a/docs/html/platform.htm +++ b/docs/html/platform.htm @@ -1,3 +1,4 @@ + Platforms supported by wxWindows 2.4 @@ -90,7 +91,7 @@ often don't work.
    All BSD systems tests are for wxGTK using gcc. FreeBSD - version from 3.2 to 4.6, x86OkVZ
    + all version between 3.2 and 5.0 x86OkVZ
    @@ -107,7 +108,7 @@ often don't work. Solaris wxMotif with Sun CC 4.2OkVZThread support must be disabled on system with not MT-safe X11 wxMotif with gccOk

    - wxGTK with Sun CC 4.2OkShiv Shankar Ramakrishnan
    + wxGTK with Sun CC 4.2Ok
    wxGTK with gccOk

    wxGTK with Sun CC 5.0 and 6.1 (Solaris 7 and 8)OkJiri MracekYou have to edit line 2079 in glib.h to fix GTK+ error diff --git a/docs/tech/tn0014.txt b/docs/tech/tn0014.txt index 08a9cfaf4c..f7ec689a60 100644 --- a/docs/tech/tn0014.txt +++ b/docs/tech/tn0014.txt @@ -299,6 +299,23 @@ position Position -1,-1 size Size -1,-1 style Style[wxScrolledWindow] wxHSCROLL | wxVSCROLL +wxSplitterWindow +---------------- +position Position -1,-1 +size Size -1,-1 +style Style[wxSplitterWindow] wxSP_3D +sashpos Integer 0 + (Initial sash position) +minsize Integer -1 + (Minimal panel size) +orientation "horizontal"|"vertical" horizontal + +wxSplitterWindow must have at least one and at most two children objects. +If there's only one child object, it is passed to wxSplitterWindow::Initialize +and the splitter is created unsplitted. If there are two children, the +splitter is created splitted, either horizontally or vertically depending +on the value of "orientation" attribute. + 5. More features diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h index 2ac1db392c..51ccbf3533 100644 --- a/include/wx/xrc/xh_all.h +++ b/include/wx/xrc/xh_all.h @@ -47,5 +47,7 @@ #include "wx/xrc/xh_gdctl.h" #include "wx/xrc/xh_frame.h" #include "wx/xrc/xh_scwin.h" +#include "wx/xrc/xh_split.h" +#include "wx/xrc/xh_wizrd.h" #endif // _WX_XMLRES_H_ diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index ca0f650ca8..25eccb7df1 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -24,7 +24,7 @@ HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \ xh_radbt.h xh_radbx.h xh_sizer.h xh_slidr.h xh_spin.h xh_stbmp.h \ xh_sttxt.h xh_text.h xh_listb.h xml.h xmlres.h xh_toolb.h \ xh_bmpbt.h xh_cald.h xh_listc.h xh_scrol.h xh_stbox.h xh_tree.h \ - xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h xh_scwin.h + xh_stlin.h xh_bmp.h xh_unkwn.h xh_frame.h xh_gdctl.h xh_scwin.h xh_split.h xh_wizrd.h OBJECTS=$(EXPAT_OBJECTS) \ xml.o xmlres.o xmlrsall.o \ @@ -33,7 +33,7 @@ OBJECTS=$(EXPAT_OBJECTS) \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \ - xh_frame.o xh_gdctl.o xh_scwin.o + xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o DEPFILES=$(OBJECTS:.o=.d) APPEXTRADEFS=-I$(top_srcdir)/contrib/include $(EXPAT_DEFS) diff --git a/src/xrc/XrcVC.dsp b/src/xrc/XrcVC.dsp index 174c339711..d0b782997d 100644 --- a/src/xrc/XrcVC.dsp +++ b/src/xrc/XrcVC.dsp @@ -228,6 +228,14 @@ SOURCE=.\xh_tree.cpp # End Source File # Begin Source File +SOURCE=.\xh_split.cpp +# End Source File +# Begin Source File + +SOURCE=.\xh_wizrd.cpp +# End Source File +# Begin Source File + SOURCE=.\xh_unkwn.cpp # End Source File # Begin Source File diff --git a/src/xrc/makefile.b32 b/src/xrc/makefile.b32 index 2024abb133..af44b29d59 100644 --- a/src/xrc/makefile.b32 +++ b/src/xrc/makefile.b32 @@ -27,7 +27,7 @@ OBJECTS=$(EXPAT_OBJECTS) \ xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj \ xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj \ xh_bmpbt.obj xh_cald.obj xh_listc.obj xh_scrol.obj xh_stbox.obj \ - xh_tree.obj xh_unkwn.obj xh_frame.obj xh_gdctl.obj xh_scwin.obj + xh_tree.obj xh_unkwn.obj xh_frame.obj xh_gdctl.obj xh_scwin.obj xh_split.obj xh_wizrd.obj !include $(WXDIR)\src\makelib.b32 diff --git a/src/xrc/makefile.g95 b/src/xrc/makefile.g95 index 00b31580dc..a3e9d80636 100644 --- a/src/xrc/makefile.g95 +++ b/src/xrc/makefile.g95 @@ -28,7 +28,7 @@ OBJECTS= $(XMLPARSEDIR_OBJECTS) $(XMLTOKDIR_OBJECTS) \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \ - xh_frame.o xh_gdctl.o xh_scwin.o + xh_frame.o xh_gdctl.o xh_scwin.o xh_split.o xh_wizrd.o include $(WXDIR)/src/makelib.g95 diff --git a/src/xrc/makefile.vc b/src/xrc/makefile.vc index 6065d42e49..a3cfa52369 100644 --- a/src/xrc/makefile.vc +++ b/src/xrc/makefile.vc @@ -57,7 +57,7 @@ OBJECTS=$(EXPAT_OBJS) \ $(D)\xh_text.obj $(D)\xh_listb.obj $(D)\xh_toolb.obj \ $(D)\xh_bmpbt.obj $(D)\xh_cald.obj $(D)\xh_listc.obj $(D)\xh_scrol.obj \ $(D)\xh_stbox.obj $(D)\xh_tree.obj $(D)\xh_stlin.obj $(D)\xh_bmp.obj \ - $(D)\xh_unkwn.obj $(D)\xh_gdctl.obj $(D)\xh_scwin.obj + $(D)\xh_unkwn.obj $(D)\xh_gdctl.obj $(D)\xh_scwin.obj $(D)\xh_split.obj $(D)\xh_wizrd.obj !include $(WXDIR)\src\makelib.vc diff --git a/src/xrc/makefile.wat b/src/xrc/makefile.wat index 3d489d8aea..a128327d0a 100644 --- a/src/xrc/makefile.wat +++ b/src/xrc/makefile.wat @@ -47,6 +47,7 @@ OBJECTS=& $(OUTPUTDIR)\xh_unkwn.obj & $(OUTPUTDIR)\xh_frame.obj & $(OUTPUTDIR)\xh_scwin.obj & - $(OUTPUTDIR)\xh_split.obj + $(OUTPUTDIR)\xh_split.obj & + $(OUTPUTDIR)\xh_wizrd.obj !include $(WXDIR)\src\makelib.wat diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp index fa5cbdccfb..7cf5e4fec0 100644 --- a/src/xrc/xh_sizer.cpp +++ b/src/xrc/xh_sizer.cpp @@ -139,6 +139,8 @@ wxObject *wxSizerXmlHandler::DoCreateResource() wxCHECK_MSG(m_parentSizer != NULL || ((IsOfClass(parentNode, wxT("wxPanel")) || + IsOfClass(parentNode, wxT("wxWizardPage")) || + IsOfClass(parentNode, wxT("wxWizardPageSimple")) || IsOfClass(parentNode, wxT("wxFrame")) || IsOfClass(parentNode, wxT("wxDialog"))) && parentNode->GetType() == wxXML_ELEMENT_NODE), NULL, diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp index 5d933f9490..7de3f4f9cb 100644 --- a/src/xrc/xmlrsall.cpp +++ b/src/xrc/xmlrsall.cpp @@ -95,4 +95,8 @@ void wxXmlResource::InitAllHandlers() #endif AddHandler(new wxFrameXmlHandler); AddHandler(new wxScrolledWindowXmlHandler); + AddHandler(new wxSplitterWindowXmlHandler); +#if wxUSE_WIZARDDLG + AddHandler(new wxWizardXmlHandler); +#endif }