Backported wxSplitterWindow and wxWizard from head
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -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_
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -95,4 +95,8 @@ void wxXmlResource::InitAllHandlers()
|
||||
#endif
|
||||
AddHandler(new wxFrameXmlHandler);
|
||||
AddHandler(new wxScrolledWindowXmlHandler);
|
||||
AddHandler(new wxSplitterWindowXmlHandler);
|
||||
#if wxUSE_WIZARDDLG
|
||||
AddHandler(new wxWizardXmlHandler);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -112,6 +112,8 @@ All (GUI):
|
||||
wxMessageOutput::Set(new wxMessageOutputLog); to your program
|
||||
(you will need to #include <wx/msgout.h>)
|
||||
|
||||
- Backported XRC handlers for wxSplitterWindow and wxWizard.
|
||||
|
||||
wxMSW:
|
||||
|
||||
! build system changed: setup.h is not a static file in include/wx any more
|
||||
|
||||
@@ -40,6 +40,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
|
||||
<li><a href="#base">What is wxBase?</a></li>
|
||||
<li><a href="#univ">What is wxUniversal?</a></li>
|
||||
<li><a href="#jave">What about Java?</a></li>
|
||||
<li><a href="#dotnet">What about .NET/Mono?</a></li>
|
||||
<li><a href="#help">How can I help the project?</a></li>
|
||||
</ul>
|
||||
<hr>
|
||||
@@ -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.<P>
|
||||
|
||||
<H3><a name="dotnet">What about .NET/Mono?</a></H3>
|
||||
|
||||
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.<P>
|
||||
|
||||
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.<P>
|
||||
|
||||
<ol>
|
||||
<li>Not everyone wants or needs net services.
|
||||
<li>C++ will be used for a long time to come; compared with C++, C# is a recent development and its future is not certain.
|
||||
<li>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).
|
||||
<li>C# is usually byte-compiled and therefore slower. Plus, .NET adds a layer of overhead to the client computer
|
||||
that wxWindows does not require.
|
||||
<li>Mono hasn't proven its long-term viability yet (it's a complex system of components); wxWindows is ready now.
|
||||
<li>You may not wish to buy into Microsoft marketing spin and APIs.
|
||||
<li>.NET might never be implemented on some platforms, especially Mac and embedded variants of Linux.
|
||||
<li>wxPython and other language variants provide further reasons for wxWindows to continue.
|
||||
<li>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!)
|
||||
</ol>
|
||||
|
||||
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 <a href="http://wxnet.sourceforge.net/" target=_new>wx.NET</a> project is now in progress.
|
||||
|
||||
<P>
|
||||
|
||||
<H3><a name="help">How can I help the project?</a></H3>
|
||||
|
||||
Please check out the <a href="http://www.wxwindows.org/develop2.htm">Community</a> pages,
|
||||
|
||||
@@ -38,6 +38,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
|
||||
<li><a href="#smarterrors">What are the smart preprocessing errors with the Apple Developer Tools?</a></li>
|
||||
<li><a href="#aboutmenu">How does wxMac support the standard Apple About menu item and Help menu?</a></li>
|
||||
<li><a href="#findericon">How do I add an icon to my application?</a></li>
|
||||
<li><a href="#switching">How can I easily switch between different versions of wxWindows in CodeWarrior?</a></li>
|
||||
</ul>
|
||||
<hr>
|
||||
|
||||
@@ -214,6 +215,22 @@ your project and in the CodeWarrior Settings add a check mark under Linker:Outpu
|
||||
Flags/Finder Flags/Has Custom Icon.
|
||||
<P>
|
||||
|
||||
<h3><a name="switching">How can I easily switch between different versions of wxWindows in CodeWarrior?</a></h3>
|
||||
|
||||
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.<P>
|
||||
|
||||
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.
|
||||
<P>
|
||||
|
||||
From now on you can just change the path associated with the symbolic name.
|
||||
|
||||
<P>
|
||||
|
||||
|
||||
</font>
|
||||
|
||||
</BODY>
|
||||
|
||||
@@ -43,6 +43,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
|
||||
<li><a href="#vcdebug">How do you use VC++'s memory leak checking instead of that in wxWindows?</a></li>
|
||||
<li><a href="#shortcutproblem">Why are menu hotkeys or shortcuts not working in my application?</a></li>
|
||||
<li><a href="#regconfig">Why can I not write to the HKLM part of the registry with wxRegConfig?</a></li>
|
||||
<li><a href="#access">Is MS Active Accessibility supported?</a></li>
|
||||
</ul>
|
||||
<hr>
|
||||
|
||||
@@ -113,6 +114,23 @@ the following:
|
||||
</assembly>
|
||||
</pre>
|
||||
|
||||
If you want to add it to your application permanently,
|
||||
you can also include it in your .rc file using this
|
||||
line:<P>
|
||||
|
||||
<PRE>
|
||||
1 24 "winxp.manifest"
|
||||
</PRE>
|
||||
|
||||
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.<P>
|
||||
|
||||
For an explanation of this syntax, please see
|
||||
<a href="http://delphi.about.com/library/bluc/text/uc111601a.htm" target=_new>this
|
||||
article</a>.
|
||||
<P>
|
||||
|
||||
<h3><a name="compilers">What compilers are supported?</a></h3>
|
||||
|
||||
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.<P>
|
||||
|
||||
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).<P>
|
||||
|
||||
If you want to distribute really small executables, you can
|
||||
use <a href="http://www.un4seen.com/petite/" target=_top>Petite</a>
|
||||
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 <a href="http://upx.sourceforge.net/" target=_top>UPX</a>.
|
||||
use DLLs. Another good compression tool (probably better than Petite) is <a href="http://upx.sourceforge.net/" target=_top>UPX</a>.
|
||||
<P>
|
||||
|
||||
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.<P>
|
||||
|
||||
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.
|
||||
<P>
|
||||
|
||||
<H3><a name="mfc">Is wxWindows compatible with MFC?</a></H3>
|
||||
|
||||
@@ -464,6 +483,13 @@ bool myGlobalConfig::Write (const wxString& key, const wxString& value)
|
||||
}
|
||||
</pre>
|
||||
|
||||
<H3><a name="#access">Is MS Active Accessibility supported?</a></H3>
|
||||
|
||||
This is being worked on. Please see <a href="http://www.wxwindows.org/access.htm">this page</a>
|
||||
for the current status.
|
||||
|
||||
<P>
|
||||
|
||||
</font>
|
||||
|
||||
</BODY>
|
||||
|
||||
@@ -64,12 +64,26 @@ translations as of wxWindows 2.3.
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign=center>Chinese</td>
|
||||
<td valign=center>Catalan</td>
|
||||
<td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
|
||||
<td align=center valign=center><A HREF="mailto:paubcrespo@hotmail.com">Pau Bosch i Crespo</A>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign=center>Chinese (simplified)</td>
|
||||
<td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
|
||||
<td align=center valign=center><A HREF="mailto:mrfx@fm365.com">mrfx</A>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign=center>Chinese (traditional)</td>
|
||||
<td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
|
||||
<td align=center valign=center><A HREF="mailto:pal.tw@yahoo.com.tw">pal.tw</A>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign=center>Czech</td>
|
||||
<td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
|
||||
@@ -157,8 +171,9 @@ translations as of wxWindows 2.3.
|
||||
|
||||
<tr>
|
||||
<td valign=center>Polish</td>
|
||||
<td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>
|
||||
<td align=center valign=center><A HREF="mailto:matiso@hoga.pl">Piotr Mackowiak</A></td>
|
||||
<td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
|
||||
<td align=center valign=center><A HREF="mailto:matiso@hoga.pl">Piotr Mackowiak</A>,
|
||||
<a href="mailto:jpiw@go2.pl">Janusz Piwowarski</a></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
@@ -201,6 +216,13 @@ translations as of wxWindows 2.3.
|
||||
<td align=center valign=center><A HREF="mailto:dogusanh@dynaset.org">Hakki Dogusan</A></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td valign=center>Ukrainian</td>
|
||||
<td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></td>
|
||||
<td align=center valign=center><A HREF="mailto:manko@salingshot.co.nz">Eugene Manko></td>
|
||||
</tr>
|
||||
|
||||
|
||||
|
||||
</table>
|
||||
|
||||
@@ -259,5 +281,3 @@ any comments/suggestions.
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<title>Platforms supported by wxWindows 2.4</title>
|
||||
@@ -90,7 +91,7 @@ often don't work.
|
||||
<tr> <td bgcolor="#fafafa"><br></td><td bgcolor="#fafafa" colspan=5> All BSD systems tests are for wxGTK using gcc. </td>
|
||||
<tr>
|
||||
<td bgcolor="#F0F0F0" align=center valign=center rowspan=1>FreeBSD</td>
|
||||
<td>version from 3.2 to 4.6, x86</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td><br></td>
|
||||
<td>all version between 3.2 and 5.0 x86</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td><br></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
@@ -107,7 +108,7 @@ often don't work.
|
||||
<td bgcolor="#FFFFFF" align=center valign=center rowspan=5>Solaris</td>
|
||||
<td>wxMotif with Sun CC 4.2</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td>Thread support must be disabled on system with not MT-safe X11</td>
|
||||
<tr> <td>wxMotif with gcc</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
|
||||
<tr> <td>wxGTK with Sun CC 4.2</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Shiv Shankar Ramakrishnan</td><td><br></td>
|
||||
<tr> <td>wxGTK with Sun CC 4.2</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td> </td><td><br></td>
|
||||
<tr> <td>wxGTK with gcc</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
|
||||
<tr> <td>wxGTK with Sun CC 5.0 and 6.1 (Solaris 7 and 8)</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Jiri Mracek</td><td>You have to edit line 2079 in glib.h to fix GTK+ error</td>
|
||||
</tr>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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_
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -95,4 +95,8 @@ void wxXmlResource::InitAllHandlers()
|
||||
#endif
|
||||
AddHandler(new wxFrameXmlHandler);
|
||||
AddHandler(new wxScrolledWindowXmlHandler);
|
||||
AddHandler(new wxSplitterWindowXmlHandler);
|
||||
#if wxUSE_WIZARDDLG
|
||||
AddHandler(new wxWizardXmlHandler);
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user