Compare commits

...

4159 Commits

Author SHA1 Message Date
Vadim Zeitlin
64471d3b95 Create tag WX_2_9_4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_9_4@71986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-09 14:15:51 +00:00
Vadim Zeitlin
dfb636ce8b Updated READMEs &c for 2.9.4 release.
Updated the text of the announcement posted to wx-announce too and mention it
in the release check list.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-09 14:15:37 +00:00
Vadim Zeitlin
8e98f414a1 Create tag WX_2_9_4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_9_4@71983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-09 12:39:37 +00:00
Julian Smart
5a0259e657 Fix for scroll position being changed when partial layout is done
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-08 10:28:27 +00:00
Robin Dunn
e9fed11291 Revert r71595 for now, as the bug it fixed is the lesser of two evils with the potential bugs it causes. See #14453.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-08 03:48:55 +00:00
Stefan Csomor
58cab5e243 fixing double focus ring under 10.7, emulating only for 'NO_' and 'SIMPLE_' border
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 16:34:14 +00:00
Vadim Zeitlin
97981439aa Replace "_amd64" with "_x64" in a few more places.
Fix bakefile presets and MSVC-specific setup.h.

Also document TARGET_CPU=X64 instead of AMD64.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 15:36:58 +00:00
Vadim Zeitlin
235a997f9a Use "_x64" instead of "amd64" for x64 MSW makefile builds.
Still accept "amd64" as a valid TARGET_CPU value but also accept, and
encourage people to use, "x64".

Add a new section about the build system changes to the change log and added a
mini-TOC to it to make navigating it a bit easier and show what changes are
there at a glance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:59 +00:00
Vadim Zeitlin
d2dcbf20aa Don't call HitTest() unnecessarily in MSW wxTreeCtrl code.
We already called TreeView_HitTest() above, there is no need to call
wxTreeCtrl::HitTest() again to retrieve exactly the same information.

This also incidentally fixes a warning about unused variable, see #14459.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:55 +00:00
Vadim Zeitlin
ff534ba469 Fix uninitialized variable warning in wxMSW wxFileSystemWatcher code.
This warning was harmless as the variable was in fact always initialized if
the code where it was used was reached but g++ 4.6.1 is not smart enough to
see it, just as MSVC for which we already had a workaround. So initialize it
explicitly just to suppress the warning.

See #14459.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:51 +00:00
Vadim Zeitlin
9d261cbb55 Avoid warnings about uninitialized variables in TGA loading code.
Initialize the variables containing the colour components: even though they
should normally be always filled by Palette_GetRGB() call below, this
presumably might not happen for a corrupted image with invalid palette table
entries and g++ correctly complains about it.

See #14459.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:47 +00:00
Vadim Zeitlin
85ad2fa7d2 Avoid warning about unused variable in wxGetUTCTimeMillis() in wxMSW.
Put the declaration of the variable only used under Unix inside the
corresponding "#if" branch.

See #14459.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:44 +00:00
Vadim Zeitlin
9e4587114b Avoid unused variable warning in wxPropertyGrid code in non-wxGTK.
Put the variable only used in wxGTK inside "#ifdef __WXGTK__".

This fixes the warning but the real fix would be to get rid of this variable
completely and just fix whatever problem in wxWindow::Navigate() this was
supposed to work around.

See #14459.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:40 +00:00
Vadim Zeitlin
2643e2e496 Explicitly call base class ctor in wxRichTextFieldType copy ctor.
Failure to do this provokes g++ warnings with -Wextra and is, generally
speaking, wrong, even if it probably doesn't matter in this particular case.

See #14459.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:36 +00:00
Vadim Zeitlin
57bf8a6f1e Return correct index from wxGenericListCtrl::InsertColumn().
It used to always return 0 in the generic version, return the correct index of
the newly inserted column now.

Closes #13677.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:27:31 +00:00
Stefan Csomor
9d294e51cd adding support for enabled property, avoiding missing return values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:24:05 +00:00
Stefan Csomor
074d54bcf5 added missing return value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:07:23 +00:00
Stefan Csomor
7d6a4d9696 new file added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-07 13:06:50 +00:00
Paul Cornett
41e027551c guard against empty name field in inotify_event, see #14466
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-06 16:39:08 +00:00
Vadim Zeitlin
0f79c83f89 Use list mode in wxListbook list control instead of report.
Use wxLC_LIST instead of wxLC_REPORT when we don't have any icons. This makes
the code simpler as wxLC_LIST is more similar to wxLC_ICON which we used, and
continue to use, when we do have icons, because we don't need to add and
remove any columns on the fly.

And it fixes the appearance of wxListbook without images with wxBK_TOP or
wxBK_BOTTOM styles as it now lays out its items horizontally and not
vertically as before.

It also fixes the best size calculation of wxListbook control since the
changes to wxListCtrl best size calculations in r71733 as a nice side effect.

Closes #14451.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 17:09:53 +00:00
Stefan Csomor
d68a2a24d1 supporting alignment in single line controls, see #14452
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 16:42:03 +00:00
Stefan Csomor
af098dd344 using correct constant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 16:30:24 +00:00
Stefan Csomor
72e88d8ea3 fixing another reference to wrong center flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 16:17:55 +00:00
Stefan Csomor
33d8353fa5 correcting text alignment flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 16:15:02 +00:00
Vadim Zeitlin
37e8713ee4 Fix problem with most of wxGTK headers not being installed.
GTK2_HDR should also include all the version-independent wxGTK headers.

Closes #14455.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 11:45:38 +00:00
Vadim Zeitlin
e6bd7695da Rename all setup0.h files to setup.h in git-based release script.
We also need to rename wx/univ/setup0.h and wx/gtk/setup0.h and it probably
doesn't hurt to rename all the other ones even if though they're unused
anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 11:45:35 +00:00
Vadim Zeitlin
29e9a09825 Put the README file used for SourceForge files page under version control.
And this is another thing to do for the release.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 11:45:33 +00:00
Vadim Zeitlin
b963ee6027 Remove duplicate item about Trac changes from release tech note.
Part of the additions of r71951 was already present in this file, just in
another place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 11:45:30 +00:00
Vadim Zeitlin
798e3fb358 Run unix2dos in quiet mode in git-oriented release script.
Don't flood the screen with the messages about converting the files, we know
that we convert them, this is what we run the bloody thing for.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-04 11:45:27 +00:00
Vadim Zeitlin
d737ddd155 Create tag WX_2_9_4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_9_4@71954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-03 20:02:41 +00:00
Vadim Zeitlin
b8c2e8e239 Also update the minimal GTK+ version in the introduction manual page.
And mention GTK+ 3 there too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-03 20:01:27 +00:00
Vadim Zeitlin
926f71030a Update the date in the manual before 2.9.4 release.
And mention the need to do it in the tech note for the next time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-03 19:59:56 +00:00
Vadim Zeitlin
02de14d202 Updated readme and changelog for 2.9.4 release.
Also add more things to do before the release to the tech note.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-03 19:58:51 +00:00
Vadim Zeitlin
a83354f85c Remove unnecessary checks for OS X 10.4 and gcc 4.0 in configure.
As 10.4 is not supported any more, don't check for it. Also don't impose the
use of gcc 4.0 for compiling wxOSX/Carbon as this compiler doesn't exist any
more under OS X 10.7 but wxOSX/Carbon can be compiled using gcc 4.2 if 10.6
SDK is selected, so this change allows to build wxOSX/Carbon under 10.7.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-03 19:41:58 +00:00
Paul Cornett
7344108e8a synchronize GTK2 minimum version in docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-03 05:37:02 +00:00
Vadim Zeitlin
c38373bd54 Fix wxGTK compilation with MSVC after GTK+ 3 changes.
Don't use preprocessor conditions inside a macro invocation, MSVC doesn't
support this.

Closes #14448.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 22:59:14 +00:00
Paul Cornett
dc26e9846f add some mention of GTK3 support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 15:56:47 +00:00
Vadim Zeitlin
300fed484c Temporarily disable the failing wxRichTextCtrl case.
Disable CaretPosition() unit test as it is broken now. This is only temporary
to allow tests to pass in 2.9.4, will be reenabled (and hopefully fixed) later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 15:08:09 +00:00
Vadim Zeitlin
12ca260575 Clear larger area in wxGCDC::Clear().
Clearing a rectangle of size 32000 was not always enough to clear the entire
DC, so use INT_MAX instead -- this is the best we can do with the current
approach.

Closes #13445.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 15:05:39 +00:00
Vadim Zeitlin
d8c0d15d32 Keep client data in sync when deleting items from wxOSX wxComboBox.
Correspondence between item indices and their client data was broken if any
items were deleted or the combobox was cleared entirely. Fix this by updating
the client data array whenever this happens.

Closes #14147.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 15:03:08 +00:00
Vadim Zeitlin
4b0bf080e1 Preserve client data in wxComboBox::SetString() in wxOSX/Cocoa.
Don't reset the client data to NULL when we're just changing the item text.

Closes #14146.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 15:03:04 +00:00
Vadim Zeitlin
2de58153db Set string in wxEVT_COMMAND_COMBOBOX_SELECTED event in wxOSX/Cocoa.
Pass the selected string and not only its index in the event generated when
combobox selection changes in wxOSX/Cocoa.

Closes #14383.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 15:03:00 +00:00
Vadim Zeitlin
8b883c9de8 Add extra border below the buttons in the generic log dialog.
This fixes the problem with the dialog appearance in wxOSX/Cocoa where the
bottom of the buttons was truncated otherwise and arguably makes the dialog
look slightly better in the other ports too.

Closes #14398.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 15:02:56 +00:00
Vadim Zeitlin
119e862ca9 Fix wxDataViewChoiceRenderer behaviour in wxOSX/Cocoa.
Changing the value of a "choice" cell in wxDataViewCtrl didn't work correctly
in wxOSX/Cocoa because wxDataViewChoiceRenderer used the base class version of
OSXOnCellChanged() which passed the integer index we received from NSOutlineView
to the model instead of the expected string.

Fix this by overriding OSXOnCellChanged() in wxDataViewChoiceRenderer itself
and using its argument as an integer index of the selection because this is
what it is, at least under OS X 10.7.

Closes #14373.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 14:36:56 +00:00
Vadim Zeitlin
87762892be No changes, just suppress an unused parameter warning in wxOSX build.
This one was especially annoying as it occurred in a header included by a
couple of dozens of files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 12:46:11 +00:00
Stefan Csomor
9a0266bbf0 adapting new osx modifier handling, fixes #14377
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 12:36:18 +00:00
Stefan Csomor
0a434b1015 handling illegal fsrefs by returning an empty string, fixes #14384
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 11:54:42 +00:00
Stefan Csomor
9c841f8485 guarding against invalid files passed to 'pdoc' apple event, see #14384
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 11:50:54 +00:00
Stefan Csomor
0161592b25 guarding against invalid files passed to 'odoc' apple event, see #14384
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 11:47:29 +00:00
Vadim Zeitlin
3ac2562a7f Allow using wxGridCellEnumEditor with the mouse.
Previously the combobox was immediately dismissed when the mouse was used.

Fix this by copying the code from wxGridCellChoiceEditor to this class. This
is obviously not ideal and both classes should be refactored to avoid this in
the future but for now this at least fixes the user-visible problem.

Closes #13943.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 10:28:03 +00:00
Robin Dunn
5208671fbb Add COMPILER_VERSION to nmake command line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 02:58:58 +00:00
Vadim Zeitlin
82cf5d5953 Show gstreamer errors in wxGStreamerMediaBackend to the user.
If the media file fails to play, we really need to show to the user the
corresponding gstreamer error, otherwise there is no way to understand what
the problem is.

Collect the errors in gst_error_callback() and show them from the main thread
if we get a gstreamer error.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 00:16:18 +00:00
Vadim Zeitlin
7ae14eb15f Use wxFileSystem::FileNameToURL() in wxGStreamerMediaBackend.
Converting files to URIs is not as simple as just prepending "file://" to
them, notably we need to escape characters that are special in URIs such as
"#" and "%", so use FileNameToURL() which already does do it correctly.

Closes #13663.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 00:16:14 +00:00
Vadim Zeitlin
fcbf733155 Fix command line parsing in media player sample.
It was broken since the addition of the call to wxApp::OnInit() to
wxMediaPlayerApp::OnInit() -- as the base class parses the command line
itself, we need to use OnInitCmdLine() and OnCmdLineParsed() instead of doing
it manually if we call it.

Also don't load the play list saved in wxConfig if any command line parameters
were given as otherwise the saved files would be used first (this seems to
have been always broken...).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-02 00:16:12 +00:00
Vadim Zeitlin
69bacfaacf Fix wxMSW compilation without PCH.
Include wx/bitmap.h as we need its GetHBITMAP() method in wx/msw/dib.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 22:39:41 +00:00
Vadim Zeitlin
9043a590ce Use COMPILER_VERSION and ARCH_SUFFIX in libraries names in Windows makefiles.
For the official builds (only), include the compiler version and the
architecture suffix, unless it's the default x86, into the DLL names, to allow
their concurrent installations for multiple compiler versions and architectures.

Closes #13857.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 21:35:23 +00:00
Vadim Zeitlin
df1547b7bc No real changes, just rename DIR_SUFFIX_CPU to ARCH_SUFFIX in bakefiles.
This will be soon used in the libraries names and not only in the directory
paths so rename the variable to make things more clear (or at least less
confusing).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 21:35:18 +00:00
Vadim Zeitlin
75aaa4c5ac Forward WM_{CUT,COPY,PASTE} from edit control to wxComboBox in wxMSW too.
This allows us to receive wxClipboardTextEvents from wxComboBox as well.

Update the documentation to mention this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 21:10:08 +00:00
Paul Cornett
efaad1f079 remove some unused files from GTK3 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 19:10:38 +00:00
Paul Cornett
d5cc191c9c eliminate possibility of configure enabling gnomeprint with GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 17:44:44 +00:00
Stefan Csomor
983aac2cdc using common code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 17:13:46 +00:00
Stefan Csomor
40aa05e0b8 common code for normalization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 17:03:39 +00:00
Paul Cornett
7537769845 override DoSetValue() to avoid unnecessary clipboard operations, fixes #14369
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 16:43:16 +00:00
Stefan Csomor
14de8214d6 native drop target method for cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 15:46:56 +00:00
Stefan Csomor
f31c06b39e native hook for supported datatypes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 15:46:26 +00:00
Stefan Csomor
5ce7b0b55c adding native hook for drop target
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 15:45:15 +00:00
Stefan Csomor
3c7037000b make sure the pasteboard paste location is only set once
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 13:20:33 +00:00
Vadim Zeitlin
fa88bebec1 Implement wxDisplay::GetFromWindow() for wxGTK/Windows.
As wxWindow doesn't have an associated HWND when using wxGTK, use
MonitorFromPoint() instead of MonitorFromWindow() for this port.

Closes #14408.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 11:35:52 +00:00
Vadim Zeitlin
7462bddbaf Fix the use of AutoHBITMAP in recently added LoadImageFromResource().
Assignment operator of AutoHBITMAP doesn't work as expected (and probably
should be removed/fixed), avoid its use by explicitly calling Init().

Closes #14425.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-01 11:35:49 +00:00
Vadim Zeitlin
d01ec0965c No changes, just suppress an unused variable warning.
Omit the name of the exception object that we never use.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 23:41:33 +00:00
Vadim Zeitlin
3253852a7e VC6 compilation fix for the grid sample.
Use Connect() instead of Bind() which is not available for VC6.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 23:41:30 +00:00
Vadim Zeitlin
005b12d8be Make wxBookCtrlBase::GetPage() virtual to fix it for wxAuiNotebook.
wxAuiNotebook doesn't store its page in the base class m_pages array, so
calling GetPage() on it via a wxBookCtrl pointer resulted in a crash.

Make GetPage() virtual to allow overriding it at wxAuiNotebook level.

Closes #13768.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 23:41:27 +00:00
Vadim Zeitlin
c55488dfff Add skeleton documentation for wxAuiNotebook-related classes.
Closes #14386.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 23:41:23 +00:00
Vadim Zeitlin
7447d53c35 Implement hatched/stippled pens/brushes in wxGraphicsContext for Cairo.
Refactor the pen/brushes classes to introduce a common base class for them
containing their colour and hatch pattern and stipple bitmap, if any.

And actually create the hatched pattern and use it.

Closes #11981.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 23:41:18 +00:00
Vadim Zeitlin
c17eafaaf1 Added internal wxHatchStyle enum.
It's annoying that the same code for hatched pens and brushes can't be reused
without relying on deprecated wxXXX_HATCH constants, so add new,
non-deprecated, wxHatchStyle enum that can be used in such code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 23:41:15 +00:00
Robin Dunn
e269b28e8e Only disable generation of dependencies if more than one architecture is being built.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 20:59:51 +00:00
Robin Dunn
ba8540022f Move a couple standard virtuals to protected sections so they can be overridden in derived classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 20:59:46 +00:00
Robin Dunn
55d47fc2b1 Interface fix for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 20:59:39 +00:00
Paul Cornett
9dc44eff02 support for GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 20:39:06 +00:00
Vadim Zeitlin
6f41c10973 Force wide char environment version initialization in wxGetEnvMap().
When using MSVC CRT, the wide character version of the environment is not
always initialized when using main() (and not _wmain()) as entry point, so
force initializing it before using _tenviron.

Closes #14231.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:40 +00:00
Vadim Zeitlin
a523d3c643 Add a unit test verifying that wxSpinCtrl ctor doesn't generate any events.
This shouldn't happen but did (and apparently still does, sometimes) under MSW
so add a test verifying that no events are generated by the ctor.

See #14428.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:36 +00:00
Vadim Zeitlin
9c505a36e7 Use wxString::t_str(), not fn_str(), with Windows API functions.
fn_str() is supposed to be used with the CRT functions taking file names only,
not Windows API functions that always take LPCTSTR with all compilers/CRT
versions.

Closes #14433.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:32 +00:00
Vadim Zeitlin
26cdd42d2c Define wxEntry() with WinMain-compatible signature for all Windows ports.
Make wxEntry(HINSTANCE, ...) available in wxGTK under Windows too.

Refactor the headers to allow this and extract Windows-specific wxEntry()
declarations in wx/msw/init.h from wx/msw/app.h for consistency with the
normal wxEntry(int, char**) declared in wx/init.h.

Closes #14423.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:28 +00:00
Vadim Zeitlin
327972e7b6 Use bitmaps from resources by default in wxGTK under Windows.
Use wxBITMAP_TYPE_{BMP,CUR,ICON}_RESOURCE by default under Windows, even for
non-wxMSW ports.

Also allow loading wxImage from resources in all ports under MSW as a side
effect of this change.

Closes #14425.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:23 +00:00
Vadim Zeitlin
c21b99e0e2 Add wxRibbonBar::DeletePage() and ClearPages() methods.
Also add a trivial GetPageCount() helper.

Closes #14437.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:18 +00:00
Vadim Zeitlin
34f5c1053a Update debugging macros overview in the docs.
Describe how the debugging macros really work since 2.9.1, i.e. explain
wxDEBUG_LEVEL and NDEBUG instead of __WXDEBUG__.

Closes #14435.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:14 +00:00
Vadim Zeitlin
ff1aede620 Create wxStaticBoxSizer elements as children of wxStaticBox in XRC.
As we now recommend creating the controls shown inside wxStaticBox as its
children, and not siblings, follow our own recommendation by doing just this
in XRC handler of wxStaticBoxSizer.

Also add a test of using a tooltip with a wxStaticBoxSizer element to the XRC
demo showing that tooltips do work now for them, unlike before.

Closes #14431.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:10 +00:00
Vadim Zeitlin
a19d4096a9 Don't hard code horizontal border for wxStaticBox in wxGTK.
Compute the border width from the average character width instead of hard
coding it to 5 pixels. Probably doesn't make much difference in practice, but
seems to make more sense.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:07 +00:00
Vadim Zeitlin
10da53a250 Fix vertical offset for wxGTK wxStaticBox without label.
Don't use different size for the vertical border in wxStaticBox just because
it doesn't have any label, this just doesn't seem necessary and results in
different appearance for the static box with and without label.

Closes #14430.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 16:33:04 +00:00
Vadim Zeitlin
38b1843b5c Fix generation of wxEVT_CHAR in wxMSW wxComboBox.
wxEVT_CHAR shouldn't be generated at all if wxEVT_KEY_DOWN was handled but it
still was for wxComboBox because the code in its MSW implementation directly
called HandleKeyDown() and HandleChar() methods, bypassing the logic dealing
with m_lastKeyDownProcessed at wxWindow level.

Fix this by calling MSWHandleMessage() instead to ensure that WM_CHAR after a
handled WM_KEYDOWN are ignored as they ought to.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-29 23:55:54 +00:00
Jouk Jansen
2026fd77f5 Add wxUSE_COMPILER_TLS to OpenVMS setup file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-29 06:44:00 +00:00
Stefan Csomor
d1a00499b1 unconditionally include coretext-replacement function when having a deployment target of 10.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-28 12:11:50 +00:00
Vadim Zeitlin
0199dae316 Fix off by 1 error in wxHTML font size from points calculation.
m_FontSize is in 1..7 range, not 0..6, so add 1 to it when setting it from the
index into m_FontsSizes array.

Also update the comment explaining the valid range of m_FontsSize.

Closes #14442.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-28 11:58:55 +00:00
Robin Dunn
5812de8ade Interface fix for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-28 06:55:54 +00:00
Robin Dunn
34c92eeeb7 Don't hide the m_mm_to_pix_x and m_mm_to_pix_y in the base class by redefining them in a derived class. Fixes #14399.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-26 18:25:29 +00:00
Robin Dunn
1fe9a78fd0 Add missing parent classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-26 02:01:09 +00:00
Stefan Csomor
0476fe3d73 adding new API needed for screenshots as old method stopped working in 10.7
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-25 15:23:50 +00:00
Julian Smart
e58471c77f Fix for page break problem: fixes #14429
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-25 08:02:32 +00:00
Paul Cornett
8f71e657f3 update size hints when decoration size becomes known, and preserve size hint increments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-24 16:18:28 +00:00
Paul Cornett
6186cb7416 implement wxCairoContext::GetPartialTextExtents for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-24 06:33:07 +00:00
Vadim Zeitlin
8bc6150f03 Clarify wxFileOffset description a bit.
It wasn't clear how wxFileOffset was defined under Windows without
wxHAS_HUGE_FILES.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-23 12:27:14 +00:00
Paul Cornett
e8440ff58c properly handle stupidly small maximum size hints
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-23 03:33:08 +00:00
Robin Dunn
3668a019dc Add simple document for wxGUIEventLoop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-23 00:44:14 +00:00
Paul Cornett
f94d58dd75 fix SetSizeHints when wxDefaultSize is given for min or max size
GTK does unexpected things if both min and max size are not explicitly set

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-22 06:41:56 +00:00
Julian Smart
b5a1cc93f3 Fixed #14429: Printing a large table in wxRichTextCtrl fails
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-21 20:12:44 +00:00
Julian Smart
a8a15de623 Prevent index access error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-21 19:12:04 +00:00
Julian Smart
59c9dd5c61 Compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-21 18:39:34 +00:00
Vadim Zeitlin
5da0507745 Don't call gtk_window_set_geometry_hints() if there are no hints to set.
Calling gtk_window_set_geometry_hints() with the hints mask of 0 doesn't work
correctly and sets the window size to the smallest possible. Avoid this by
simply not calling this function at all if there is nothing to do.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-21 13:19:30 +00:00
Vadim Zeitlin
692a0709d3 Add MSVS autoexp.dat fragment for some common wxWidgets types.
As we have gdb pretty printers under the version control, it makes sense to
also put MSVS visualizers there as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-20 18:24:22 +00:00
Vadim Zeitlin
fa3f11806e Use wx/msw/winundef.h for wxGTK under Windows too.
Avoid clashes due to <windows.h> definitions in wxGTK too.

Closes #14427.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-20 17:54:53 +00:00
Vadim Zeitlin
6fafab0ea3 No real changes, just simplify wxGDIPlusContext::GetTextExtent() a bit.
Don't call Font::GetSize() and FontFamily::GetEmHeight() thrice, just do it
once and store the results. This makes the code both simpler and shorter and
marginally more efficient.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-20 17:54:49 +00:00
Vadim Zeitlin
b437ff98b0 Fix text extent computation in wxMSW wxGraphicsContext.
The results were incorrect for italic or bold fonts as we hardcoded
FontStyleRegular instead of using the real font style.

Closes #14421.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-20 17:54:46 +00:00
Vadim Zeitlin
7e3ea54f47 Add missing c_str() and similar calls to samples in STL build.
Don't rely on implicit conversion of wxString to char*/wxChar*, it doesn't
exist in STL build. Add explicit c_str(), wc_str() or t_str() calls.

Closes #14420.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-20 17:54:42 +00:00
Vadim Zeitlin
9597d39a2e Use C, not C++, comments in wx/gtk/chkconf.h.
Remove C++ comments added in r71796.

See #14412.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-20 17:54:38 +00:00
Robin Dunn
e1b7217e23 Interface tweaks for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-20 17:10:23 +00:00
Stefan Csomor
372d999e64 make sure native font exists, before asking about fixed width
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-20 10:34:30 +00:00
Stefan Csomor
2979ddbe2f using UTType constants wherever possible to avoid typos, checking for failed conversions, leveraging native conversion of types, fixes #13442
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-20 07:16:03 +00:00
Stefan Csomor
9ba371fa05 supporting promised file urls for transfer, see #14281
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-18 20:27:35 +00:00
Julian Smart
5a376169b1 Fixed #14417: wxRichTextCtrl crashes on LoadFile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-18 18:45:30 +00:00
Paul Cornett
268fba466f build fix for wxUSE_STL==1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-18 16:11:36 +00:00
Stefan Csomor
fb35086d8c supporting promised file urls for transfer, see #14281
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-18 15:13:53 +00:00
Robin Dunn
37a181d500 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-18 02:14:07 +00:00
Vadim Zeitlin
acbed1149e Fixes for building wxGTK under Cygwin.
Test for __WXMSW__ instead of __CYGWIN__ to not affect building non-MSW ports
such as wxGTK under Cygwin.

See #14382.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-17 21:35:14 +00:00
Vadim Zeitlin
954fd05108 Disable creation of wxDIB from wxBitmap in non-wxMSW ports.
wxDIB can now be used with wxGTK under Windows, i.e. when not using wxMSW
version of wxBitmap but it can't be created from wxBitmap then as it doesn't
have a corresponding HBITMAP.

Simply disable this functionality when not using wxMSW.

Closes #14414.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-17 21:35:10 +00:00
Vadim Zeitlin
598fe99d56 Move wxBell() from base to core library.
This allows to get rid of ugly preprocessor checks due to the fact that this
function could be defined in one or the other library depending on the port
used and also fix a problem with it being defined differently in the base
library depending on which GUI port (Carbon or Cocoa) was used under OS X.
It also fixes the problem with wxBell() in wxGTK under Windows.

Closes #14406.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-17 21:35:06 +00:00
Vadim Zeitlin
54f59b007e Disable options that don't work with wxGTK in wx/chkconf.h.
When building wxGTK under Windows, some MSW-specific options can be defined
but can't be implemented when using GTK, forcefully disable them.

Also a few others that could be implemented but that don't work currently.

Finally, forcefully enable Cairo support as wxGTK always needs it.

Closes #14412.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-17 21:35:01 +00:00
Vadim Zeitlin
1383c34c91 Define wxGTK GTK version symbols in GTK-specific setup.h.
When not using configure __WXGTKxxx__ symbols should still be defined, assume
we use a recent GTK 2.x version and define all of them.

Closes #14411.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-17 21:34:57 +00:00
Vadim Zeitlin
85b1dc6e3c Don't use Unix-specific wxGTK utility functions under non-Unix.
Unix-specific functions shouldn't be used under Windows, add "#ifdef __UNIX__"
guards around them.

Closes #14410.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-17 21:34:54 +00:00
Vadim Zeitlin
a7130edbab Provide wxGetKeyState() studfor wxGTK under Windows.
Under Unix this function is implemented in X11-specific code, so provide a
stub under Windows to at least avoid link errors.

Closes #14409.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-17 21:34:50 +00:00
Vadim Zeitlin
b33e9f4031 Add wxUSE_COMPILER_TLS to allow disabling compiler TLS support.
Compiler TLS support is broken under Win32/MSVC when used for a code which is
part of a dynamically loaded DLL, so allow disabling it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-17 21:34:47 +00:00
Paul Cornett
233f786e8e update version check for glib 2.32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-17 17:08:35 +00:00
Vadim Zeitlin
8e2c6c3f7d No real changes, just use wxSize::Get{Width,Height} and not Get{X,Y}.
Use more readable accessors in wxGrid code to avoid confusion between wxGrid
(x, y) coordinates and wxSize (x, y) fields.

Closes #14347.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 23:23:27 +00:00
Vadim Zeitlin
4a699e3a59 Remove unnecessary base class OnPaint() call from wxGenericColourDialog.
Events should be skipped instead of calling the base class event handler
directly, but in this case even this is not needed as wxGenericColourDialog
takes care of processing the event completely.

Closes #14405.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 23:23:23 +00:00
Vadim Zeitlin
d6cf9064d4 Remove left over conflict markers from documentation.
Closes #14404.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 23:23:20 +00:00
Vadim Zeitlin
95fbc73897 Fix compilation of MSW wxFSVolume with non-wxMSW ports.
There is no way to construct wxIcon from HICON when not using wxMSW, just
leave it unimplemented for non-wxMSW ports.

Closes #14402.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 23:23:16 +00:00
Vadim Zeitlin
568fb7e9f6 Fix harmless MSVC warning about converting pointer to bool.
Compare the pointer with NULL explicitly to avoid "forcing value to bool"
warning C4800 from MSVC in richtext code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 23:23:14 +00:00
Vadim Zeitlin
6114fa0350 Only use Unix sockets API under Unix in wxGTK.
wxGTK can now be used under Windows where Unix sockets are not available, add
a __UNIX__ preprocessor check.

Closes #14407.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 23:23:11 +00:00
Stefan Csomor
0090b737ff trying to improve appearance of gridcelltexteditor under OSX, see #14042
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 17:48:29 +00:00
Stefan Csomor
1bfba4a096 avoid idling in native file dialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 16:57:27 +00:00
Stefan Csomor
c657294b52 better naming wxCFEventLoopPauseIdleEvents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 16:24:09 +00:00
Stefan Csomor
ffbee8108f using suppression of idle processing (delayed destruction happened too early eg when showing native message boxes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 00:04:50 +00:00
Stefan Csomor
4c4cbded1f offer suppression of idle processing (delayed destruction happened too early eg when showing native message boxes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 00:03:51 +00:00
Stefan Csomor
9ef3f6f2c9 setting debug level explicitly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 23:21:57 +00:00
Stefan Csomor
c0b301f4e5 cleanup for 10.5 minimum
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 22:29:07 +00:00
Stefan Csomor
d20028be9a clang analyzer support specific for OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 22:02:06 +00:00
Stefan Csomor
a2c3d6b820 FixedWith support through CoreText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 21:55:28 +00:00
Stefan Csomor
721ba9cbdc using CoreText under iOS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 21:53:06 +00:00
Stefan Csomor
f5fac4471b guarding agains NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 21:51:19 +00:00
Stefan Csomor
7d5b794ce4 guard XTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 21:47:52 +00:00
Stefan Csomor
8ffac5b07b CoreText font enumeration support for iOS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 21:46:34 +00:00
Stefan Csomor
51b0f3719b CoreText support for iOS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 21:43:42 +00:00
Stefan Csomor
e1875c7859 fixing analyzer warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 21:40:12 +00:00
Stefan Csomor
ecbbb06b3b removing superfluous 10.5 checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 21:37:08 +00:00
Stefan Csomor
63660cba0a as we always have CoreText available under 10.5+, we can properly determine fixed widths fonts, also use latest CoreText API if available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 19:11:52 +00:00
Stefan Csomor
2b760b6bc1 removing attribute, as assert is not guaranteed not to return, but may just go on
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-14 15:07:14 +00:00
Stefan Csomor
b625fff509 using WX_ATTRIBUTE_NORETURN for asserts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 23:33:52 +00:00
Stefan Csomor
9deded7972 adding WX_ATTRIBUTE_NORETURN support (for functions like assert, exit etc. that may not return)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 23:33:00 +00:00
Robin Dunn
aa3cb98a40 minor doc tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 23:20:20 +00:00
Robin Dunn
bab9aa28da Fix for compilo on non-PCH builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 23:20:14 +00:00
Robin Dunn
df30f9537b Allow the doxygen command to be used to be specified in the environment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 23:20:08 +00:00
Robin Dunn
119d50a82f update comment about SDKs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 23:20:02 +00:00
Stefan Csomor
35e1c4bf30 using native cocoa method for determining main window, fixes #14287
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 22:53:27 +00:00
Stefan Csomor
78f212178e exposing mainWindow for C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 22:32:07 +00:00
Stefan Csomor
6ca7f2f6c4 indicating the memory ownership of our c-method for the clang analyzer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 18:43:37 +00:00
Stefan Csomor
cc510e1364 supporting clang memory management annotations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 18:42:51 +00:00
Stefan Csomor
34f35c75c4 adding explanation for osx and fixing typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 17:55:19 +00:00
Stefan Csomor
6e88438166 proper init
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 17:38:28 +00:00
Stefan Csomor
3503581b33 having ONE set of raster-ops starting from 10.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 17:13:05 +00:00
Stefan Csomor
8cc8979669 fixing mem leak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 16:43:07 +00:00
Stefan Csomor
ccef0e708a proper braces avoiding potential dangling else resulting from expansion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-13 16:42:08 +00:00
Stefan Csomor
eebddb377e avoiding dangerous redraw events for windows that are on their way out…
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 23:32:46 +00:00
Vadim Zeitlin
3aa1dc1ef5 Slightly improve best size calculation for wxListCtrl with wxLC_NO_HEADER.
Use some arbitrary but relatively large width and height instead of falling
back to wxControlBase best size computation which, at least in wxGTK, simply
returns (1, 1) resulting in list control of unusably small size.

This is, of course, still far from ideal and we should really use the items to
calculate the best width but it at least allow the list control in the generic
log dialog to be shown correctly in wxGTK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 22:15:38 +00:00
Vadim Zeitlin
e14e0b2f15 No real changes, just add a wxCHECK to GetDlgUnitBase().
Verify that we do have a valid TLW parent: even though this normally should be
always the case, it might not be when the window is being created or destroyed,
see #14355.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:57:02 +00:00
Vadim Zeitlin
a15781955d Fix crash in wxStaticBox::HandleEraseBkgnd() in wxMSW on closing.
Don't process WM_ERASEBKGND if we're being destroyed. This is at best useful
and at worst harmful as we currently crash in wxStaticBox::GetClientSize() if
there is no valid TLW parent.

Closes #14355.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:56:58 +00:00
Vadim Zeitlin
3dd3049516 Only use Unix/X11-specific files under Unix in wxGTK.
No real changes for now, this is another commit in preparation for wxGTK under
MSW support.

Closes #14394.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:42:15 +00:00
Vadim Zeitlin
adb783cc0a Remove another unneeded TOOLKIT test from the bakefiles.
Don't check the toolkit unnecessarily, this doesn't really change anything
right now but will not break wxGTK build under MSW when support for it is
added.

Closes #14379.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:42:02 +00:00
Vadim Zeitlin
d44d80da5b Add wx/setup.h header for wxGTK build under MSW.
This is identical to wx/msw/setup0.h but will be used by wxGTK builds using
MSVC when this is supported.

Closes #14395.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:41:59 +00:00
Vadim Zeitlin
18717b27d6 Compilation fix in non-PCH build of wxMSW wxStaticBox.
Include wx/sizer.h now that we use sizers in static box DoGetBestSize().

Closes #14397.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:41:53 +00:00
Vadim Zeitlin
1c0a0736a3 Don't use generic wxListCtrl style for wxListMainWindow.
This resulted in double border around wxListCtrl contents in wxOSX and almost
certainly other ports except wxGTK for which we already had an explicit
preprocessor check in the generic list control code. Remove it and simply
don't use any wxListCtrl-specific styles, including borders, for its main
window as it doesn't make any sense.

Closes #3701.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:41:50 +00:00
Vadim Zeitlin
ac6d7c66e0 Make wxMSW tree item unlocking reentrant.
Handle creating nested TreeItemUnlocker objects correctly. This fixes the
problem when a wxTreeCtrl method unlocking some item is called with another
item is already unlocked, e.g. from a selection changed event handler.

Closes #14400.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:41:40 +00:00
Stefan Csomor
d52ded25c1 support for native tlw parents, see #14252
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 18:44:31 +00:00
Stefan Csomor
9651e41c1c using callback for menu enabling, allows to benefit from system menu disabling eg for modal dialogs, see #14177
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 00:23:22 +00:00
Stefan Csomor
2f9d199130 setting source as this, according to thread '[wx-dev] Bug in wxMenuBarBase::UpdateMenus'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 00:21:51 +00:00
Robin Dunn
1dcb50be4a Fix compilation error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-10 17:09:49 +00:00
Vadim Zeitlin
f421e3f119 Fix wxHTMLDataObject compilation and memory leaks.
Use wxString::FromUTF8() and utf8_str() instead of directly using wxConvUTF8
as this is simpler and also works correctly in non-Unicode build (and more
efficiently in UTF-8 build as no conversion is done there).

Do not allocate -- and leak -- buffer in wxHTMLDataObject::GetDataHere(),
we're supposed to be putting data into the caller-provided buffer instead of
using our own.

Closes #14391.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-10 11:57:20 +00:00
Robin Dunn
0681e07a14 Keep track of the area intended to be buffered, and use that in UnMask instead of defaulting to the buffer size. Only clip to the DC size if wxBUFFER_VIRTUAL_AREA is not set. This fixes the issue where buffering the full virtual area in a wxScrolledWindow would only draw an area the physical size of the window. Fixes #11612.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 19:26:19 +00:00
Robin Dunn
dab0a95bab Add doc for SendAutoScrollEvents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 19:26:12 +00:00
Vadim Zeitlin
fd20ceff24 Fix wxWindow::IsDescendant() to work with argument equal to this window.
Passing the window itself as IsDescendant() argument for a top level window
resulted in a NULL pointer dereference. Fix this and also simplify the
function code by not using the parent window before checking it's !NULL.

Closes #14387.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 18:44:18 +00:00
Vadim Zeitlin
9bd5c5fcda Use wxString::Clone() instead of c_str() in wxThreadEvent copy ctor.
Creating a new wxString from c_str() of the old one resulted in dropping all
string data after the first embedded NUL. Fix this by using Clone() method
that exists specifically for this purpose. It also makes the code more clear.

Closes #14380.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 18:44:14 +00:00
Vadim Zeitlin
5c3f21c6a3 Use PLATFORM checks in bakefiles instead of TOOLKIT checks.
No real changes as the output is currently the same for all supported
PLATFORM/TOOLKIT combinations anyhow but prefer checking for PLATFORM to
prepare for the support of GTK toolkit under MSW platform.

Closes #14379.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 18:44:10 +00:00
Robin Dunn
cf737db657 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 05:11:21 +00:00
Paul Cornett
d5027818a4 fix warnings about conversion to bool, closes #14381
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 05:18:30 +00:00
Paul Cornett
ecdfd09516 fix warnings about unreachable return statements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 05:13:19 +00:00
Robin Dunn
e1b8b76fcf Add export macro for wxTreeListEvent so the non-inline class info and things can be found where they're exepcted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 04:43:15 +00:00
Robin Dunn
4af280d8ca Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 04:43:09 +00:00
Robin Dunn
9c58d1d310 Add missing wxRichToolTip::SetTitleFont implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 04:43:02 +00:00
Robin Dunn
08f639f16e Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 04:42:57 +00:00
Václav Slavík
432d207e1c wxHtmlHelpWindow: Fix contents panel syncing with view.
Simply opened page notification code. Fix it to really highlight the
page currently visible, instead of the previous one.

Fixes #14320.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-06 17:18:15 +00:00
Robin Dunn
7af4648f66 add missing public keyword for base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-06 02:06:24 +00:00
Robin Dunn
d18eb918f4 If there is a sizer then use it's calculated minimum in wxStaticBox::DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 21:26:53 +00:00
Robin Dunn
5eeccdd52c Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 21:26:48 +00:00
Robin Dunn
f15e648744 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 21:26:42 +00:00
Paul Cornett
12a5cf1324 Workaround for Ubuntu 12.04 run time warning
"LIBDBUSMENU-GLIB-WARNING **: Trying to remove a child that doesn't believe we're it's parent."
Avoid calling gtk_widget_destroy() on a wxMenuBar attached to a frame
Fixes #14292


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 16:49:28 +00:00
Vadim Zeitlin
c7001dcd53 Don't give incorrect example in wxTextEntry::GetInsertionPoint() docs.
Using the text control position as index in GetValue() is wrong in general,
show the correct way of doing this.

Closes #14372.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 12:21:29 +00:00
Vadim Zeitlin
a15f0e42bc Fix ribbon sample compilation after r71642.
Add a missing header with declaration of wxMessageBox() for PCH-less
compilation.

Closes #14376.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 12:12:43 +00:00
Paul Cornett
401c8bc231 Fix layout of wxStaticText, and possibly other controls.
GtkLabel perversely does not use its actual size to do layout, but will use its
size request. So restore calling gtk_widget_set_size_request() for all widgets,
which was removed in r71465. See #14374


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-04 17:36:51 +00:00
Julian Smart
340ef5c5ab Corrected collection of common attributes, for clashing font size units.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-04 09:13:13 +00:00
Vadim Zeitlin
0a7ee6e0f4 Implement support for wxRIBBON_PANEL_EXT_BUTTON wxRibbonPanel style.
Show the "extension button" in the ribbon panel if this style is specified.

Also generate a specific event if this button is clicked.

Closes #14283.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 19:17:09 +00:00
Vadim Zeitlin
07c7226468 Add wxRibbonControl::GetAncestorRibbonBar() helper.
New method allowing to find the ribbon bar containing the given window.

See #14283.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 19:17:03 +00:00
Vadim Zeitlin
017dc06b50 Use wxString::t_str() in calls to Windows API functions in wxMSW.
Use t_str() instead of wx_str() to make the code work correctly in UTF-8 build
in which wx_str() returns a pointer to UTF-8 buffer while we need a wchar_t
pointer for Windows.

Closes #14371.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 19:16:59 +00:00
Steve Lamerton
f40f8e1722 Use wxCOMPtr throughout wxWebViewIE to simplify the code and reduce the chance of memory leaks. Also mark PPV_ARGS_CHECK as inline so it can be used from multiple libraries.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 17:41:32 +00:00
Vadim Zeitlin
41087dc90a Add support for MSVC 11 (a.k.a. MSVS 2012) to MSVC-specific setup.h.
Use vc110 prefix for VC11.

Closes #14366.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 22:34:21 +00:00
Vadim Zeitlin
0c9dd3b69b Clear old selection when wxListBox becomes empty.
When UpdateOldSelections() is called from wxListBox::DoClear(), it must clear
the old selections array even for single selection list boxes, but it didn't
do this under non-MSW platforms.

Specifically check for the case of an empty listbox now and just forget the
old selections then. This fixes the problem of keeping stale old selections
and is also more efficient as we avoid the unnecessary GetSelections() call.

Really closes #14359.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 22:34:17 +00:00
Vadim Zeitlin
125afca0c0 Add wxMSW_CONV_LPCTSTR() and related macros and use them in wxBase.
Add macros hiding the ugly casts needed to pass wxStrings to Windows API
functions and use them in a couple of places in wxBase to simplify the code.

Closes #14338.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 22:34:13 +00:00
Vadim Zeitlin
784130d290 Disable wxUIActionSimulator wxGrid tests using mouse under wxGTK.
Something is seriously wrong with simulated mouse events and wxGrid under
wxGTK, they seem to simply disappear sometimes. This results in unit tests
suite failure, so disable these tests for the next release as I just don't
understand how to fix them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 16:21:08 +00:00
Vadim Zeitlin
f1287154cd Add IsAutomaticTest() function to the unit tests.
This allows to easily test if we're running on a buildbot slave and disable
some difficult to debug test failures there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 16:21:06 +00:00
Vadim Zeitlin
e84d989930 Use printf() instead of wxPrintf() in cppunit details listener.
Wide char output from wxPrintf() didn't appear at all under Linux because
stdout was switched into narrow stream mode by GNU libc due to initial use of
cout in the test.

Use printf() instead of wxPrintf() as we are only printing ASCII strings
anyhow. Of course, this is not a real fix but at least we can see the tests
results like this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 16:21:03 +00:00
Vadim Zeitlin
7d35d3ed3c Compilation fix to wxWebView under wxOSX/Carbon after r71620.
wxWindow::m_peer is private, use GetPeer() to access it.

See #14352.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 15:25:28 +00:00
Vadim Zeitlin
3e1db65507 Fix wxWebKitCtrl::RunScript() return value.
Replace comparisons of the type name of the returned value with isKindOfClass:
checks which are more reliable.

Closes #14358.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 15:25:25 +00:00
Vadim Zeitlin
2253f18176 Add support for CP1258 (Vietnamese) and CP1361 (Korean Johab) encodings.
Recognize these encodings names and translate them to/from the corresponding
charset constants in wxMSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:46 +00:00
Vadim Zeitlin
0980e7b323 Use "GBK" as alternative name for CP936 encoding.
This is the official name of this encoding, so recognize it as synonym.

See #14360.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:37 +00:00
Vadim Zeitlin
4e116788a2 Use float instead of double division in wxHashMap code.
We don't need double precision for determining the hash table fill rate and
using double constant also results in float-to-double promotion warnings from
gcc 4.7.

See #14362.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:34 +00:00
Vadim Zeitlin
3ceb10b162 Keep user-set wxFrame background color even if MSW system background changes.
Don't override wxFrame background colour when the system background colour
changes if it was explicitly set by the user.

Closes #14364.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:31 +00:00
Vadim Zeitlin
fb040ec186 Update old selections after clearing wxListBox in wxGTK.
Don't keep stale selected item indices in m_oldSelections after clearing the
listbox, call UpdateOldSelections() from DoClear() in wxGTK just as we do in
the other ports.

Closes #14359.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:28 +00:00
Vadim Zeitlin
80a4659776 Use wxCLASSINFO() instead of deprecated CLASSINFO().
No real changes, just use the version of the macro with a "wx" prefix.

Closes #14356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:24 +00:00
Vadim Zeitlin
345c78ca5f Use wxDynamicCast() instead of IsKindOf() checks.
wxDynamicCast() is less verbose (due to the absence of "CLASSINFO") and more
compatible with the standard dynamic_cast<>, so prefer to use it when possible.

See #14356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:18 +00:00
Vadim Zeitlin
7e8a20edc8 Remove unneeded dynamic cast in wxPropertyGrid.
It's completely useless to check that an object is of its own statically
declared type as this is always true, simply don't do it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:12 +00:00
Vadim Zeitlin
31a33b67c0 Remove unnecessary dynamic cast in wxComboPopupWindow.
Objects of this type are either always of wxPopupTransientWindow type, in
which case just a static_cast<> is enough and we don't need a dynamic one, or
is never of its type in which case this code shouldn't be compiled and if it
is, then static_cast<> will correctly fail preventing it from compiling.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:09 +00:00
Vadim Zeitlin
0cafb0786e Don't reset previous window event handler in PopEventHandler().
This is harmless but also useless as the previous event handler of a wxWindow
is always NULL anyhow, so simply don't do this. This is consistent with
PushEventHandler() which doesn't call SetPreviousHandler() for the window
itself neither.

Closes #14353.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:05 +00:00
Vadim Zeitlin
06d14de207 Fix wxMac preprocessor check in wxWebView code.
Fix typo in "__WXMAC__" in wxWebView under wxOSX/Carbon and also in
wxWebKitCtrl from where this code was copied.

Closes #14352.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:02 +00:00
Vadim Zeitlin
f00acdb8f4 No changes, just refactor wxGrid::Render() to simplify it.
Introduce a couple of new helpers to make the main Render() function smaller
and more clear.

Closes #14347.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:00:58 +00:00
Paul Cornett
4c5fc80a69 silence warning about converting NULL to wxUIntPtr
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-31 16:29:30 +00:00
Paul Cornett
6b66bb1e55 silence warning about __WXMSW__ not defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-31 16:28:42 +00:00
Robin Dunn
b8acf11e74 A patch adding wxHTMLDataObject which can be used for handling the standard platform formats for transfering HTML formatted text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-30 19:21:42 +00:00
Stefan Csomor
f5f0774124 fixing build with wxUSE_PROTOCOL = 1 and wxUSE_SOCKETS = 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-30 04:20:59 +00:00
Robin Dunn
5ad24e6dbb Adjust the client area origin and the client size of the MSW wxStaticBox according to the guidelines on http://msdn.microsoft.com/en-us/library/aa511279.aspx. This is so widgets that are children of the static box will not overlap the label or box borders.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-30 03:13:35 +00:00
Robin Dunn
7d40f0a500 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-30 03:13:27 +00:00
Stefan Csomor
09e7316547 adapting char event handling to msw / gtk, see #13415, see #14197
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-29 15:26:27 +00:00
Stefan Csomor
f0d3d77b97 clang compat.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-29 15:24:50 +00:00
Stefan Csomor
81f94bb54e clang compat.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-29 15:18:52 +00:00
Vadim Zeitlin
2060e34cd2 Improve wxDatePickerCtrlGeneric best size calculation.
Make the control just wide enough to fully show the contents of its text part.

This is still not ideal as we don't take into account wxComboCtrl internal
complications but better than before.

Closes #14342.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-28 19:38:02 +00:00
Vadim Zeitlin
5d8cdb5d1c Fix bug in wxAutomationObject introduced by r71574.
Check that we have any arguments, expression oleArgs[0] is invalid otherwise.

Closes #14343.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-28 12:52:03 +00:00
Vadim Zeitlin
779e28da63 Add wxGrid::Render() for drawing the grid to any wxDC.
In particular, this allows to print the grid contents easily.

Closes #14294.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-27 13:00:19 +00:00
Vadim Zeitlin
b55d57aa24 Add wxGrid::DrawRangeGridLines().
This method draws only the grid lines for the cells in the specified range and
not for all of them.

It is not used yet but will be by the upcoming wxGrid::Render(), see #14294.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-27 13:00:13 +00:00
Vadim Zeitlin
f31d3faf7a No changes, just refactor wxGrid::DrawAllGridLines().
Extract the actual drawing of the lines into a new DoDrawGridLines() method.

This will be used by the upcoming commits for drawing grid lines for a part of
the grid only, see #14294.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-27 13:00:09 +00:00
Vadim Zeitlin
cf1a582ab9 Fix memory leaks in wxAutomationObject::Invoke().
Use wxVector<>, wxBasicString and wxOleVariantArg instead of raw arrays, BSTR
and VARIANT to ensure that different objects allocated by this function are
always freed when it exits.

Closes #14293.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-27 13:00:04 +00:00
Julian Smart
4ba36292f4 Added full scaling to wxRTC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-26 14:17:46 +00:00
Vadim Zeitlin
7ed9cd2891 Fix bug with unloading wxPluginLibrary objects in "wrong" order.
wxPluginLibrary objects had to be unloaded in exactly the reverse order to
which they were loaded in. This was not documented and was a serious
limitation for any realistic use of plugins anyhow, so fix it and allow
unloading them in any order now.

Instead of keeping a pointer to the last wxClassInfo not created by this
plugin, now keep a pointer to the first wxClassInfo that was created by it.
This makes the code slightly more complex but this pointer, unlike the old
one, remains valid even if another plugin was unloaded.

Closes #14261.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-26 12:29:54 +00:00
Vadim Zeitlin
f0d38b659f Refactor SAFEARRAY creation code in wxConvertStringFromOle().
No changes, just make the code simpler and more obviously correct by using a
helper class to create and fill the SAFEARRAY that we create.

Closes #14296.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-26 12:29:50 +00:00
Vadim Zeitlin
252255e852 Fix DrawChoice() behaviour in wxRendererXP.
The implementation of wxRendererXP::DrawChoice() inadvertently used
wxRendererMSW::DrawComboBoxDropButton() and so drew the button in the classic
and not themed style.

Fix this by defining DrawChoice() in the base wxRendererMSWBase class and
reusing it in wxRendererXP via inheritance and not composition.

Closes #14337.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-26 12:29:46 +00:00
Vadim Zeitlin
ffa7b75018 Remove private headers from files.bkl.
Private headers are not supposed to be installed because they are only use
when building wxWidgets itself, so don't list them in files.bkl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-26 12:29:44 +00:00
Vadim Zeitlin
fcb9299bda Move include/wx/osx/private/objcid.h to include/wx/osx/core.
This header is used by public headers and hence is not really private, move it
to a better place and add it to the list of OSX headers in the bakefile.

Closes #14339.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-26 12:29:39 +00:00
Vadim Zeitlin
5fb4b6cd65 Add wxDataViewListCtrl::GetItemCount().
This method is convenient and (almost, except for the return value) compatible
with wxListCtrl.

See #11088.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 17:02:40 +00:00
Vadim Zeitlin
518cef0470 Add wxDataViewListCtrl::{Set,Get}ItemData() methods.
These methods are convenient when migrating the code that previously used
wxListCtrl to wxDataViewCtrl.

Closes #11088.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 17:02:35 +00:00
Vadim Zeitlin
41abc29aa6 Use wxUIntPtr instead of wxClientData in wxDataViewListCtrl.
Do not delete the client data in wxDataViewListCtrl, this class mainly exists
for compatibility with wxListCtrl and as the latter doesn't delete its client
data, neither should the former.

See #11088.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 17:02:31 +00:00
Vadim Zeitlin
dbec0fc8d8 Remove redundant wxAuiNotebook methods already present in wxBookCtrlBase.
wxAuiNotebook already inherits perfectly workable AdvanceSelection() and
GetCurrentPage() methods from wxBookCtrlBase, no need to reimplement them in
it.

See #14309.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 09:48:26 +00:00
Vadim Zeitlin
44f4f7dda0 Don't send a huge number of unneeded wxChildFocusEvents.
wxControlContainer::SetLastFocus() propagated wxChildFocusEvent explicitly to
its parent but this is not needed because wxChildFocusEvents propagate by
default, being derived from wxCommandEvent. And doing it again resulted in the
total number of events increasing exponentially with the depth of the window
hierarchy and real performance problems due to processing all of them.

Closes #14310.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 09:48:22 +00:00
Vadim Zeitlin
005a8a4c77 Suppress warnings about gnome_print_dialog_get_range() return type.
This function seems to be declared incorrectly and while it actually does
return the values we compare its return value with, it's prototyped with a
wrong enum as return type, so explicitly cast it to int to avoid warnings
from recent g++ versions.

See http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/115782/focus=115955

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 09:48:20 +00:00
Vadim Zeitlin
0cd7db14f0 Fully implement wxStyledTextCtrl::PositionToXY().
Fill in the column parameter too now.

Closes #14332.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 09:48:16 +00:00
Vadim Zeitlin
6094165c4e Fix calculation of wxStyledTextCtrl selection size in GetSelectedText().
Do the same changes as were done in r71540 to GetSelectedTextRaw() in
GetSelectedText() itself by modifying the code in gen_iface.py that generates
it.

Closes #14331.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 09:48:12 +00:00
Vadim Zeitlin
fd5cfba711 Several fixes for wxAffineMatrix2D transformations.
Correct errors in TransformPoint() and TransformDistance().

Change Rotate() to interpret positive angles as rotating clockwise, for
consistency with wxGraphicsContext::Rotate().

Improve the unit test to verify that all the transformations work correctly.

Closes #14334.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-25 09:48:09 +00:00
Robin Dunn
016a3d4cee Changes to allow these build scripts to use python3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-24 23:26:34 +00:00
Robin Dunn
c9db153a51 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-24 23:26:27 +00:00
Vadim Zeitlin
9a25f336cb Document that SetFocus() can't be called from EVT_KILL_FOCUS handler.
Also explain how to use wxIdleEvent for "delated action".

See #14335.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-24 23:21:19 +00:00
Vadim Zeitlin
b2b6da49e2 Fix wxBase compilation with UTF-8-based wxString under MSW.
Use wxString::t_str() instead of wx_str() in Windows API function calls.

Closes #14325.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-23 21:16:45 +00:00
Vadim Zeitlin
364f3b0700 Don't use wxCHECK_W32API_VERSION() in #if when it can be undefined.
wxCHECK_W32API_VERSION() is only defined when using MinGW, don't use it an #if
test which is always parsed but only in a separate test inside #ifdef __GNUG__
test which is parsed only when we do use MinGW.

This fixes harmless but annoying warning from MSVC 10.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-23 21:16:41 +00:00
Vadim Zeitlin
ff7dbb27d4 No real changes, just slightly simplify HasAppKit_10_6() function.
Remove redundant check for version == -1.

See #13831.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-23 21:16:38 +00:00
Vadim Zeitlin
da94537c64 Compilation fix for wxUSE_STL && !wxUSE_STL_BASED_WXSTRING build.
Don't rely on implicit wxString to "const char*" conversion in Replace().

Closes #14327.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-23 21:16:35 +00:00
Vadim Zeitlin
ee0fc51fe3 Document that wxClipboard::Flush() is not implemented in wxGTK.
See #10515.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-23 21:16:31 +00:00
Vadim Zeitlin
5ec18516f6 Document "raw control" use with accelerators.
Mention it in the places where the other accelerator prefixes are documented.

See #13496.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-23 21:16:28 +00:00
Vadim Zeitlin
1a692f0f22 Fix calculation of the wxStyledTextCtrl selection size.
Use SCI_GETSELTEXT to compute the size of the buffer instead of doing it
ourselves, especially as we do it incorrectly in case of rectangular
selection.

Closes #14331.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-23 21:16:24 +00:00
Vadim Zeitlin
0bcbf72bdc No real changes, just backwards propagate the changes to stc.cpp.
Apply the changes done directly to stc.cpp in r71428 and r71429 to the script
generating this code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-23 21:16:22 +00:00
Vadim Zeitlin
956b1c8553 Fix removing event handler filters in wxEvtHandler.
Removal from the simply linked list of event filters wasn't done correctly as
the pointer to the previous node was never updated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-23 20:36:08 +00:00
Jouk Jansen
55e0100847 Fix compilation when wxUSE_DRAG_AND_DROP=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-22 07:37:10 +00:00
Robin Dunn
d72927c120 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-22 00:17:03 +00:00
Jouk Jansen
d4df01f140 Allow for compilation with wxUSE_TOOLTIPS=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-21 08:39:03 +00:00
Jouk Jansen
8b465a4973 Add aui-capability top wxMOTIF for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-21 08:31:37 +00:00
Robin Dunn
099243cb43 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 21:58:27 +00:00
Vadim Zeitlin
11716cbe14 Fix 62 harmless but annoying Clang warnings in wxOSX build.
Clang warns about using letters and digits in a switch on wxKeyCode enum which
doesn't include them as elements. This is generally useful but really annoying
in this case, especially due to the sheer number of warnings, so disable it
using Clang-specific pragma.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 20:29:56 +00:00
Vadim Zeitlin
d92f48bd43 Use wxObjCID instead of "struct objc_object*" to fix clang build.
Clang doesn't accept "struct objc_object*" as synonym for "id" in Objective-C
code, so use the real "id" for it while still using the struct pointer for C++
code where "id" is not defined.

Closes #13565.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 20:29:50 +00:00
Vadim Zeitlin
445eaabd3e Add support for task bar icon tooltips to wxOSX version.
Set the tooltip used for the icon in wxOSX/Cocoa version of wxTaskBarIcon.

Closes #14298.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 20:29:41 +00:00
Vadim Zeitlin
632e509309 Improve check for OS X version in Cocoa wxFileDialog implementation.
A library using wxWidgets linked with 10.6 SDK might be loaded into an
application loading 10.5 version of AppKit in which case 10.6-specific
functions shouldn't be used. Check for the AppKit version effectively in use
instead of just checking for the system version.

Closes #13831.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 20:29:35 +00:00
Vadim Zeitlin
4be7f29aa7 Reset wxDialog::m_modality sooner in wxOSX.
Change the internal flag to wxDIALOG_MODALITY_NONE before sending
wxEVT_WINDOW_MODAL_DIALOG_CLOSED event. This ensures that if the dialog is
shown again from this event handler it works correctly.

Closes #13951.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 20:29:29 +00:00
Vadim Zeitlin
abf99aad2d Implement wxStackWalker for wxOSX.
Use atos(1) to map address to their symbolic names.

Closes #10067.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 20:29:22 +00:00
Vadim Zeitlin
816e7781b0 Fix menu sample compilation under wxOSX.
Include copy.xpm under all platforms as all of them support (even though
without necessarily implementing it) wxMenuItem::SetBitmap() now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 20:29:15 +00:00
Vadim Zeitlin
a2c3fc7c75 Fix crash on destruction of wxDataViewCtrl in wxOSX.
The control remained associated to the model so a dangling pointer could be
used if the model was destroyed after the control.

Fix this by removing the control from the model list of notifiers when it is
destroyed.

Closes #14124.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 20:29:09 +00:00
Vadim Zeitlin
e779f09357 Really fix compilation in !wxUSE_LOG_DEBUG && !HAVE_VARIADIC_MACROS case.
Fix the fix of r71502, we need the variable declaration when not using
HAVE_VARIADIC_MACROS.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 19:47:32 +00:00
Vadim Zeitlin
9e0fc31c31 Remove non-existent section from Unicode overview TOC.
This section is now just a subsection, don't list it in the table of contents.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 13:08:35 +00:00
Julian Smart
5a0e33afa9 Don't use deprecated font family style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 13:06:43 +00:00
Vadim Zeitlin
b42e4b3e5a Compilation fix for wxRichTextCtrl.
Don't use wxDEFAULT, there is no match for wxFont ctor taking wxSize and it,
use wxFONTFAMILY_DEFAULT instead.

Also remove the unnecessary .c_str() from the same wxFont ctor call, there is
really no reason at all to have it there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 13:04:26 +00:00
Vadim Zeitlin
ef5fe20c79 Fix harmless warning from g++ 4.8 in C11 mode.
g++ 4.8 recognizes "cpu" in WX_CC_MANIFEST expansion as a user-defined literal
suffix, add spaces around it to prevent this from happening.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 12:30:47 +00:00
Julian Smart
32423dd824 Added pixel size capability to wxTextAttr and wxRichTextCtrl.
Fixed composite object positioning in centred and right-aligned
paragraphs.
Added field example to sample, and enabled pixel font size selection.
Added custom text and dimension scaling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 12:25:22 +00:00
Vadim Zeitlin
c564ca3c97 Fix compilation in !wxUSE_LOG_DEBUG && !HAVE_VARIADIC_MACROS case.
Define the "unused" variable unless wxLogDebug() calls are variadic macros
(not evaluating their arguments at all) and not functions.

Fixes compilation broken since r71466.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-19 16:49:11 +00:00
Vadim Zeitlin
c3b0697e28 Fix compilation in wxUSE_STL=1 build after r71467.
Restore explicit conversion of wxString to char*, there is no implicit
conversion in wxUSE_STL build.

Use utf8_str() instead of c_str() removed by r71467 however as this is what we
need for wxGTK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-19 16:49:07 +00:00
Stefan Csomor
a9946c4e6b removing unnecessary - and incorrect - override, fixes #14319
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-19 14:24:13 +00:00
Stefan Csomor
c6b6ccd40a adjusting min requirements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-19 13:17:21 +00:00
Stefan Csomor
114441d107 fixes #14318
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-19 06:33:28 +00:00
Robin Dunn
4a90549b66 Add interface and simple docs doe wxOverlay and wxDCOverlay.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-19 06:21:37 +00:00
Robin Dunn
aee775a367 Add some missing setters for wxRect.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-19 06:21:31 +00:00
Robin Dunn
2de2a46833 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-19 06:21:25 +00:00
Robin Dunn
a58eecd6d1 10.5 is the minimum SDK for both OSX ports now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-18 19:54:30 +00:00
Robin Dunn
a45d4eca0a Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-18 19:54:25 +00:00
Stefan Csomor
9ff00b8f57 fixing c++11 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-18 11:09:07 +00:00
Stefan Csomor
29a1e53086 fixing c++11 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-18 10:35:08 +00:00
Stefan Csomor
9ce18df82e fixing c++11 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-18 10:34:32 +00:00
Stefan Csomor
0601befc27 fixing c++11 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-18 09:56:33 +00:00
Stefan Csomor
5f35207b7d fixing c++11 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-18 09:56:06 +00:00
Vadim Zeitlin
3d65f6463b Improve wxDir::Traverse() documentation.
It didn't describe wxDIR_FILES correctly and didn't mention OnOpenError().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-17 16:10:22 +00:00
Vadim Zeitlin
3ecb4c01f2 Fix wrong format specifiers in the samples.
Use "%ld" instead of "%d" to format long values, using "%d" results in an
assert failure under LP64 systems as int and long have different sizes there.

Closes #14311.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-17 16:10:19 +00:00
Paul Cornett
f2c757c5cc mark virtual overrides as virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-17 15:46:26 +00:00
Paul Cornett
f069ac4801 remove some unnecessary c_str() calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-17 15:46:08 +00:00
Paul Cornett
e2cb99c856 eliminate unused variable warning with wxUSE_LOG_DEBUG==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-17 15:45:50 +00:00
Paul Cornett
3b7067a05d Remove use of "size-request" signal for wxWindow sizing.
This signal has been removed from GTK3. Instead have wxPizza keep track of child
size, and use gtk_widget_set_size_request() for wxWindows in native containers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-17 15:29:50 +00:00
Robin Dunn
e447683693 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-17 02:47:34 +00:00
Vadim Zeitlin
f919ae3477 Make variable containing port number an ushort in the sockets sample.
A port number is an unsigned short, not long, so don't make it long just
because wxCmdLineParser doesn't provide a convenient way to get the value of
an unsigned short option (it would be nice if it did...).

This fixes the problem with using "%d" format specifier with a long variable
as this resulted in an assert under LP64 systems.

See #14311.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-16 15:10:05 +00:00
Vadim Zeitlin
c4239f1920 Fix wxWakeUpIdle() in Unix console application broken by r71089.
Initialize m_pipeIsEmpty to true as we don't have anything in the pipe
initially and if this variable was false, nothing was ever written to the wake
up pipe and it was never set to true as nothing was read from it neither.

Closes #14166.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-16 15:10:01 +00:00
Vadim Zeitlin
a0b13884b4 Don't use printf() with non-literal string as format.
Replace calls to printf() with puts() in the typetest sample.

See #14311.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-16 13:24:49 +00:00
Julian Smart
d87098c062 The object size page now has full position attribute editing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-16 10:59:30 +00:00
Vadim Zeitlin
5e4bbd0f45 Fix pasting large amounts of text in wxGTK.
We need to process GDK_PROPERTY_NOTIFY events when yielding for
wxEVT_CATEGORY_CLIPBOARD, otherwise we never receive large selections.

As GDK_PROPERTY_NOTIFY can be also used for non-clipboard stuff, exceptionally
assign 2 categories to it and process it in either case.

Closes #14284.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-15 10:04:11 +00:00
Vadim Zeitlin
4d769703f6 Correct the documentation of wxSpinCtrl initial and value arguments.
It does make sense to specify "initial" if "value" is empty.

See #13589.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-15 10:04:07 +00:00
Vadim Zeitlin
82c372a7e2 Add support for wxArrayString to wxVariant-to-OLE conversion.
This allows to call COM methods taking arrays of strings easily.

Also remove support for the old and non-existent any more "stringlist" variant
type.

And add more error checking.

Closes #14296.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-15 10:04:03 +00:00
Vadim Zeitlin
96c9640205 Enable variadic macros for VC9 and later.
VC9 and 10 support variadic macros so define HAVE_VARIADIC_MACROS for them
too. This currently only affects wxLog{Debug,Trace} definitions in wx/log.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-15 10:04:01 +00:00
Vadim Zeitlin
28e42e023c Fix keyboard navigation in wx{List,Choice,Tree,Tool}book controls.
Inherit from wxNavigationEnabled<wxBookCtrlBase> instead of just
wxBookCtrlBase to ensure that the keyboard navigation works correctly for
these controls.

The toolbar in wxToolbook still doesn't accept focus from keyboard but at
least the pages can be TAB-bed too and from. And the rest of the controls
are now fully accessible using only the keyboard.

Closes #14303.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-15 10:03:57 +00:00
Vadim Zeitlin
c833f0cdb0 Use iterators instead of indices in wxStripMenuCodes().
Make the function more efficient when using UTF-8 wxStrings by using iterators
instead of indices in the loop searching for "&".

Closes #14307.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-15 10:03:53 +00:00
Julian Smart
3ef12fd203 Clear styles popup if there is no style sheet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-14 17:23:56 +00:00
Vadim Zeitlin
34c5aaa769 Simplify wxEventLoopManual pending events processing logic.
Don't try to process any remaining pending events in ProcessEvents() itself as
this was inconsistent: we only processed low-level toolkit pending events in
the main event loop itself if the loop was exited from a normal event handler
but only processed the wxApp-level pending events if it was exited from a
pending event handler. It also required more code than the new version that
simply processes all the remaining pending events, of both kinds, after the
main event loop termination.

This corrects changes of r71304 and replaces those of r71329.

Closes #14250.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 22:13:43 +00:00
Vadim Zeitlin
d44dc1bede Fix wxDateTime unit test after the changes of r71430.
Don't test the return value of ParseFormat(wxCStrData) any more as this
function is void now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 22:05:57 +00:00
Vadim Zeitlin
ae8079a210 Don't return a dangling pointer from wxDateTime::ParseXXX(wxCStrData).
We don't have any sufficiently long-lived pointer to return from this
overload, so don't return anything from it -- it's better to break the
compilation of the existing code rather than make it crash during run-time.

Closes #14214.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 21:37:25 +00:00
Vadim Zeitlin
2ed48ef81e No changes, just simplify the code using wx2stc() a little.
Assign wx2stc() return value to a suitably const variable instead of using
ugly casts to get rid of constness.

Also use wxCharBuffer/char* explicitly inside explicit wxUSE_UNICODE checks,
using wxWX2MBbuf here doesn't gain us anything and just confuses the reader of
this code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 21:37:23 +00:00
Vadim Zeitlin
d7b468788e Fix wxStyledTextCtrl compilation in non-Unicode build.
The value returned by wx2stc() in non-Unicode build is a simple "char*" and we
can't call length() method on it, add a helper wx2stclen() function to get the
length from the original wxString itself in this case.

Closes #14013.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 21:37:18 +00:00
Vadim Zeitlin
530a50ecf0 Don't assert if no icon is specified for a wxDataViewCtrl item.
An item in a column using wxDataViewIconTextRenderer might not have any valid
icon associated with it, don't assert in case it doesn't in the native GTK
version.

Notice that the generic wxDataViewCtrl implementation already supports this
but not perfectly: no space is reserved for the icon in the images without
one, so giving the image to only some of them looks ugly. The GTK version
aligns both the items with and without icon properly and simply leaves the
image part blank and it would be better to modify the generic version to do
the same thing in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 21:37:16 +00:00
Vadim Zeitlin
ed4caec714 Minor change to wxString pretty-printer for gdb.
Calling string() explicitly isn't necessary, at least not with gdb 7.2, and is
actually harmful when using Python 2.5 (which doesn't support UTF-32) with
wide strings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 21:37:13 +00:00
Vadim Zeitlin
f3027fae17 Don't handle branches specially when sorting items in wxDataViewCtrl.
The generic version of wxDataViewCtrl tried to put all branches before the
leaves when sorting. This had a couple of problems: first, it didn't do it
correctly and actually placed the branches after the leaves which didn't make
any sense. Second, this was only done in the generic version and not the
native GTK one making the behaviour inconsistent between platforms. Finally,
this behaviour just doesn't make sense in general (i.e. when items don't
necessarily represent anything in the file system and maybe even sometimes
when they do) and there doesn't seem any good reason to do it by default.

So stop doing it, partially reverting the changes of r47562.

Closes #14100.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 21:37:10 +00:00
Vadim Zeitlin
bf0f2c4b33 Disable the use of UTF-8 by default in Unix builds.
Add up-to-date description of UTF-8 support to the Unicode overview.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 13:17:25 +00:00
Vadim Zeitlin
458f68d0a7 Remove wxDECLARE_APP() from wxIMPLEMENT_APP_NO_MAIN().
There is no need for a separate declaration inside wxIMPLEMENT_APP() as
wxGetApp() is defined by it and redeclaring it immediately after definition
results in a warning with some compilers/environments (Eclipse CDT).

The move of wxGetApp() to the beginning of the macro is only to ensure that a
semicolon is still required after wxIMPLEMENT_APP_NO_MAIN() and the other
macros terminating with it, such as wxIMPLEMENT_APP() itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-13 13:17:22 +00:00
Julian Smart
d157d142f6 Fixed layout and hit-testing problem particularly with centred lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-11 22:15:39 +00:00
Vadim Zeitlin
5e4027e5ad Document that wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED is OSX-specific.
This even is not generated by neither generic nor GTK version right now.

See #14297.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-11 22:10:28 +00:00
Vadim Zeitlin
0b61390646 Fix extra event sent by wxTextEntry::ChangeValue() since r71308.
The changes of r71308 sent the event unconditionally in case the text didn't
really change but no events should be sent if the flags don't include
SetValue_SendEvent, add a check for it.

Re-closes #13936.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-11 22:10:25 +00:00
Robin Dunn
8b180bded6 Enable access to the native bitmap object wrapped by wxGraphicsBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-11 22:06:50 +00:00
Robin Dunn
caf1a3aa68 Ensure a 32-bit cairo surface is created if it is needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-11 22:06:37 +00:00
Stefan Csomor
8e19598f7f fixes SetFirstItem, Thanks to David Wright
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-11 06:28:54 +00:00
Robin Dunn
92de61e429 More interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-10 22:38:14 +00:00
Robin Dunn
c921d597cf Add wxFormatInvalid, and tweak the docs for wxDataObject::GetDataHere and SetData
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-10 22:34:46 +00:00
Robin Dunn
137c1e7f86 Add doc for wxCliboard::Get
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-10 22:34:39 +00:00
Julian Smart
1aca9fcdfc Added wxRichTextXMLHandler::RegisterNodeName so custom content classes can be added without
breaking XML loading


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-10 11:59:59 +00:00
Vadim Zeitlin
1e58c8b944 Set LF EOL style for setup.h.in file.
This file is only used under Unix so should have Unix EOLs, e.g. to allow
building Unix ports from the sources checked out under Windows.

Closes #14266.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-10 11:53:45 +00:00
Vadim Zeitlin
136aafe540 Add missing wx/scopeguard.h include to fix the build.
Closes #14285.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 17:16:26 +00:00
Vadim Zeitlin
902b679a45 Fix wxGenericListCtrl best size calculation in report view.
Just let the base class do it instead of using hard coded default value in
wxGenericListCtrl::DoGetBestClientSize().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:54 +00:00
Vadim Zeitlin
f797518e8f Unconditionally define IID_IShellItem in wxMSW sources.
This GUID may not be defined in uuid.lib even when
__IShellItem_INTERFACE_DEFINED__ is defined in the headers, so just define it
always to avoid any problems.

Closes #14244.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:51 +00:00
Vadim Zeitlin
1e20681c9e Implement constrained best size calculation in wxMSW wxListCtrl.
This fixes wxListbook controller size to avoid spurious scrollbars.

Closes #13898.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:47 +00:00
Vadim Zeitlin
402dae7b46 Improve wxBookCtrlBase controller size calculations.
Use GetBest{Height,Width}() in wxBookCtrlBase to compute the controller
control size height/width from its known (from wxBookCtrlBase size itself)
width/height. This will allow to correctly compute the size of wxListCtrl used
by wxListbook once it provides the necessary support for width-from-height and
height-from-width calculations.

See #13898.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:44 +00:00
Vadim Zeitlin
d119983947 Add wxWindow::GetBest{Height,Width}().
These functions will be used when it is necessary to determine the best size
of the control if one of its size components is fixed. Currently none of the
classes implements DoGetBestClient{Height,Width}() yet but wxListCtrl will do
it soon, see #13898.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:37 +00:00
Vadim Zeitlin
386279c3f2 Improve wxWindow best size documentation, mention DoGetBestClientSize().
Custom classes should typically override DoGetBestClientSize() instead of
DoGetBestSize() to avoid having to deal with the borders.

Also don't reference the deprecated SetInitialBestSize() unnecessarily and
document its non-deprecated replacement.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:34 +00:00
Vadim Zeitlin
d5d037c362 Mention wxFoobookEvent change from classes to #defines in the change log.
These classes can't be forward-declared any more as they're not really classes
any longer but just compatibility #defines and can't be made classes again as
this would break the existing code using wxBookCtrlEvent in 2.9.

See #14242.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:30 +00:00
Vadim Zeitlin
36b0b09078 Allow entering more digits in wxSpinCtrl in wxMSW than fits into it.
Scroll the control automatically if there is not enough space. This is
consistent with (single line) wxTextCtrl and wxSpinCtrl under the other
platforms.

Closes #14211.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:27 +00:00
Vadim Zeitlin
679dc4e813 Attach MDI "Window" menu to the parent frame menu bar in wxMSW.
This makes sense and fixes the regression with "Window" menu commands not
being processed any more after the changes of r71114.

Closes #14207.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:23 +00:00
Vadim Zeitlin
6e36db5eca Correct the initial value setting in wxMSW wxSpinCtrl.
Always use value argument for the text control contents and also override the
initial numeric value with it if it's numeric.

This seems to be the only consistent thing to do, so document this behaviour
and add a unit test checking for it.

Closes #13589.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:20 +00:00
Vadim Zeitlin
8087e6c942 Remove assert checking bitmap size in wxMenuItem drawing code in wxMSW.
This assert was fatal, as usual when asserting from a WM_PAINT handler, as the
function was reentered resulting in nested asserts and program abort, so
remove it to at least let the program continue to run even if there is not
enough space for the bitmap in the menu.

There is, of course, still something wrong with the menu geometry calculations
if this happens but I can't even reproduce this any more so not sure what
exactly.

See #11657.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:16 +00:00
Vadim Zeitlin
2c2138e937 Fix creation of wxBitmap from wxIcon in wxMSW: premultiply the pixels.
wxBitmap in wxMSW is supposed to store its data in alpha-premultiplied format
but didn't do it when it was created from an icon (or a cursor), resulting in
wrong display of wxIcons with alpha channel when they were used for e.g. menu
items.

Fix this by ensuring that the data is always premultiplied. This is not the
best solution as in some cases (e.g. if this wxBitmap is added to wxImageList
later) we could need to undo this premultiplication later which is quite
inefficient but at least it's simple and straightforward.

Closes #11414.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:12 +00:00
Vadim Zeitlin
39d169639b Fix wxString unit test when not using UTF-8.
Restrict the tests added in r70987 to run when using UTF-8 strings only, they
test for something that is simply not true (and for a bug that can't happen)
with non-multibyte encodings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:10 +00:00
Vadim Zeitlin
30ee0b9764 Fix compilation of wxVariant code with VC6.
This was broken by the changes in r71196 as the original VC6 SDK doesn't
define VARIANT::llVal.

See #14210.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:07 +00:00
Vadim Zeitlin
1b63698581 Use better face names first in wxGTK wxNativeFontInfo::SetFamily().
Try better matches and not the most widespread ones first when building a list
of face names to try for the given family. This gives better results when
these better fonts are indeed available and doesn't change anything if they
are not.

See #14126.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:03 +00:00
Vadim Zeitlin
912886949a Check that item ID is initialized when inserting it in wxListCtrl.
Using uninitialized ID happened to work by accident with 2.8 but it doesn't
work any more, try to detect this as early as possible and give a clear
explanation of why it doesn't to help fixing the broken code that used to
accidentally work.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:24:01 +00:00
Vadim Zeitlin
ae4375b878 Fix wxStaticBitmap best size calculation in wxMSW.
Take the control borders into account by overriding DoGetBestClientSize()
instead of DoGetBestSize().

Also invalidate the default best size computed before we have any valid image
when setting the initial image in Create().

Closes #4099.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 14:23:57 +00:00
Julian Smart
7c9fdebe5f Added field implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 11:06:04 +00:00
Julian Smart
f819ed5d42 Moved default margins to buffer class Init; reduced chance of accidental selection when clicking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-08 17:31:06 +00:00
Julian Smart
20d09da5f8 Corrected top-level object layout in paragraphs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 15:47:23 +00:00
Julian Smart
a70eb13eb2 Fixed inconsistent calculation of line height in paragraph layout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 13:13:30 +00:00
Vadim Zeitlin
37424888b8 No real changes, just fix some typos in comments.
Closes #14276.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 13:12:27 +00:00
Julian Smart
bea12bf084 Added non-breaking space to whitespace check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 13:12:27 +00:00
Vadim Zeitlin
25cc08c07b Use XkbKeycodeToKeysym() instead of deprecated XKeycodeToKeysym().
XKeycodeToKeysym() is deprecated in new X11 headers because it doesn't work
correctly with all symbols (https://bugs.freedesktop.org/show_bug.cgi?id=5349).
Use XkbKeycodeToKeysym() instead, this should help with some keys and also
avoids deprecation warnings during compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 13:12:23 +00:00
Vadim Zeitlin
814028444d Create a wrapper file for X11/XKBlib.h header.
We need some hacks for the older systems before including this header, extract
them from src/x11/utilsx.cpp into a new private header to be able to reuse it
from wxGTK in the next commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 13:12:20 +00:00
Václav Slavík
319ff5745e Make wxDocTemplate::CreateDocument() exceptions-safe.
Don't create the document object if InitDocument() throws.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 12:23:09 +00:00
Václav Slavík
e4f762f416 Fix performance of wxHtmlParser::SkipCommentTag() in UTF-8 build.
Avoid computing the difference between two potentially distant
iterators, which is O(1) in wchar_t build, but O(n) in UTF-8 one.

See #13445.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 11:15:31 +00:00
Václav Slavík
2a715bcb3c Fix r71367: don't set bgCol twice needlessly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-06 16:56:38 +00:00
Václav Slavík
b7f37d6d86 Fix wxOwnerDrawnComboBox background on with classic theme.
In wxMSW, if the classic theme was used, read-only wxOwnerDrawnComboBox
had gray background, but native look should be the same for both
editable and read-only combo boxes: white text entry-like rectangle.

Apparently, a similar problem existed with non-classic themes too
before, as there was a workaround in place. Fixed by moving the
workaround into code used by both themed and classic rendering.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-06 13:10:34 +00:00
Vadim Zeitlin
25e3f0c69e No changes, just spelling corrections in the comments.
Closes #14275.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-05 14:09:59 +00:00
Vadim Zeitlin
8e8d910979 Update the field widths on demand in wxStatusBarGeneric.
This ensures that the value returned from GetFieldRect() is always up to date,
even when this method is called from the user-defined wxEVT_SIZE handler, i.e.
before our own OnSize() could run.

Also remove the now unneeded hack with calling the base class OnSize() from
the statbar sample.

Closes #14268.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-05 11:22:09 +00:00
Stefan Csomor
71940de693 fixes crashes with embedded controls in toolbars after toolbar destruction, code was moved in r62988, but apparently Destroy doesn't have to be called, so do a last check, fixes #14258
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-05 05:32:19 +00:00
Vadim Zeitlin
f8ab0cdb3e Don't return NULL widget from wxFileCtrl page of widgets sample.
This makes all the common operations such as setting tooltip, colours &c on
this page simply crash.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 22:20:59 +00:00
Vadim Zeitlin
5804d539be Derive wxGenericFileCtrl from wxControl.
wxFileCtrl -- which can be #define'd as wxGenericFileCtrl -- is documented to
inherit from wxControl and does derive from it in the native GTK version, so
do it for the generic version too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 22:20:55 +00:00
Vadim Zeitlin
43868fdedc Improve documentation of wxDataViewCtrl mouse event handling.
Explain that catching mouse events directly doesn't work.

Also make it clear that double clicking an item can be caught by processing
wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED.

See #14111.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 20:35:52 +00:00
Vadim Zeitlin
e762ef8f53 Fix precompiled headers use with MSVC in wxGTK sources.
Don't use PCH for C sources, do include wx/wxprec.h from all wxGTK C++
sources.

Closes #14224.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 20:35:48 +00:00
Vadim Zeitlin
982a0fcd28 Declare variables before doing anything else in C code.
Don't put statements before variable declaration in C source file. This fixes
compilation with non C99-compliant C compilers such as MSVC.

See #14224.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 20:35:44 +00:00
Vadim Zeitlin
7d2295a0ca Allow using non-MSW toolkit in MSVC-specific auto-linking header.
This makes it possible to auto-link wxGTK library when using MSVC too.

Closes #14272.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 20:35:41 +00:00
Vadim Zeitlin
47eab2f2e5 Define wxCONCATn() macro up to n=9 from n=5 previously.
We'll need it for n=6 for the next commit, so increase the max value of n a
bit more.

See #14272.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 20:35:37 +00:00
Vadim Zeitlin
0302691e86 Use GTK-based wxWebView when using GTK+, not under Unix.
Test for the GTK+ toolkit, not Unix platform to determine whether GTK+
wxWebView version should be used.

Closes #14273.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 20:35:33 +00:00
Vadim Zeitlin
c9f6f0a8cd Add wxDir::GetNameWithSep() and use it to avoid consecutive slashes.
It is wrong to use dir.GetName()+"/" to obtain a slash-terminated directory
name as this results in (usually harmless but at best ugly) double slashes at
at the beginning of the string for the root directory. Add GetNameWithSep() to
obtain the correct result in all cases.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 20:35:31 +00:00
Vadim Zeitlin
50cbca27ad Document wxTP_DEFAULT as a standalone constant.
Make sure the declarations in the documentation header can be really parsed.

Closes #14270.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 20:35:26 +00:00
Vadim Zeitlin
bb91ff63bc Don't remove the last slash from "/" directory name under Unix.
This was totally wrong as it returned empty string as (invalid) directory
name.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-04 18:31:48 +00:00
Robin Dunn
7bb22bd68d Add wxDropSource::SetIcon for wxGTK to mimic SetCursor on the other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-03 23:30:40 +00:00
Robin Dunn
07b6b12176 * Change "def" to defResult as def is a reserved word in Python
* Correct some methods that were marked pure virtual but which aren't.
* etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-03 23:30:33 +00:00
Robin Dunn
4e4fffec19 fix incorrect default values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-03 23:30:27 +00:00
Vadim Zeitlin
df8cd0bd5e Document wxDataViewChoiceByIndexRenderer.
At least briefly document this class too and not only its parent
wxDataViewChoiceRenderer one.

Closes #14265.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-03 10:17:19 +00:00
Vadim Zeitlin
2ebef6d174 No changes, just remove duplicate flags checks in wxUniv wxTLW.
For some reason (rename of the old wxTHICK_FRAME to wxRESIZE_BORDER?) we
tested for wxRESIZE_BORDER twice in a couple of places. Don't do it for
clarity.

Closes #14264.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-03 10:17:15 +00:00
Stefan Csomor
18a7376a34 use explicit WakeUp variant, too many errors using heuristics, fixes #14176
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-02 19:38:58 +00:00
Stefan Csomor
4b0a48dbac make WakeUp variant explicit, too many errors using heuristics, like #14176
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-02 19:30:11 +00:00
Stefan Csomor
6e22db9e3e fixes #14178
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-02 18:44:23 +00:00
Dimitri Schoolwerth
ae580de376 Fixed parts of toolbar background not being drawn with older comctl32.dll.
When using comctl32.dll versions older than 6.0 toolbar icons would not have their background drawn. Fix this in a rough way by always completely erasing the background like was done before. Regression since r62971.

Closes #13512.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-02 14:44:45 +00:00
Vadim Zeitlin
c06efacb1c German translations update from Thomas Krebs.
Closes #14262.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-02 10:37:36 +00:00
Václav Slavík
dea9430d44 Fix destruction of wxDataViewCtrl's editor control.
Don't pop event handler from the control more than once.

See r70002 and r70005 (which this reverts) for reference.

Fixes #14215.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-30 14:51:52 +00:00
Václav Slavík
840fc4d170 wxDataViewCtrl: always update the header when col best width changes.
Have an explicit per-column dirty flag and use that to determine whether
we need to call wxHeaderCtrl::UpdateColumn(). Previously, the lack of
computed best width was used as an indicator, but this didn't work
correctly if some code called GetWidth() after invalidation but before
wxDataViewCtrl::UpdateColWidths() was called at idle time. This resulted
in header's column widths getting out of sync with the control itself.

Fixes #14167.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-30 09:33:30 +00:00
Václav Slavík
b6b171522b Invalidate wxDataViewCtrl bests widths on expand/collapse.
The best column widths are computed from "realized" items that are
available as rows in wxDataViewCtrl. This information changes when a
previously collapsed node is expanded and new items become available for
column width calculation.

Fixes #14167.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-30 09:33:25 +00:00
Václav Slavík
f0630187ea Respect minimal width in wxDataViewCtrl::GetBestColumnWidth().
See #14167.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-30 09:33:21 +00:00
Vadim Zeitlin
1b29603d20 Work around the problem with not exiting event loop under MSW.
Changes of r71304 broke the event loop termination under MSW, limit them to
only the case in which they were really needed, i.e. when loop is really
exited by a pending event handler.

This is only a temporary solution, we need something better in longer term.

See #14250.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:48:20 +00:00
Vadim Zeitlin
f330dce9b7 No changes, just refactor common IsSorted() tests in wxGTK wxDataViewCtrl.
Add wxDataViewCtrlInternal::ShouldBeSorted() helper instead of testing for
both IsSorted() and wxDataViewModel::HasDefaultCompare() in several places.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:34 +00:00
Vadim Zeitlin
87cf085e96 No real changes, just make wxDataViewCtrlInternal::IsSorted() const.
This is a simple accessor, should have been const since the beginning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:32 +00:00
Vadim Zeitlin
f2f5d11c0e Use PCH in the tests in all Windows ports and not only when using wxMSW.
This change doesn't actually change anything for the "normal" ports as it only
affects wxGTK/MSW which is not officially supported yet, so the make/project
files are unchanged by it.

Closes #14249.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:28 +00:00
Vadim Zeitlin
c04be1a29f Added wxDataViewEvent::SetDragFlags() and GetDropEffect() methods.
Allow specifying the drag operation flags and retrieving the drop effect when
it's over for wxDataViewCtrl drag-and-drop.

Currently this is only implemented in the generic version.

Closes #12583.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:25 +00:00
Vadim Zeitlin
167fc10e3b Set the data size in wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE in wxGTK.
Allow wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE handler to examine the data
being dragged by setting not only the pointer to it but also its size, as
otherwise it's impossible to do anything with it.

See #12583.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:21 +00:00
Vadim Zeitlin
04581fad18 Explicitly document wxDrag_XXX flags.
They were mentioned in DoDragDrop() documentation but not documented on their
own. Do it now to be able to refer to them from elsewhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:18 +00:00
Vadim Zeitlin
bf915caf9b Remove internal only methods from wxDataViewEvent documentation.
SetDataXXX() methods are only meant to be used by wxDataViewCtrl itself, so
don't document them as part of public API. Their documentation was pretty
useless anyhow as it didn't say anything not already contained in the method
name.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:16 +00:00
Vadim Zeitlin
165e563dca Restore 2.8 stock labels for wxID_PREVIEW inadvertently changed in 2.9.
The wxID_PREVIEW labels were accidentally removed in r68641 and added back
with a wrong/different label later. Restore the same one (or almost, just add
an ellipsis at the end) that was used in 2.8.

Closes #13906.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:13 +00:00
Vadim Zeitlin
7c7bd972fa Add a hack to prevent the test suite from aborting after Grid test case.
There is a problem with the native header control still having the mouse
capture when the grid is destroyed in wxGTK and this resulted in asserts when
destroying the grid, nested asserts due to an exception being thrown from a
dtor and finally abort that prevented the rest of the tests from running.

As I failed to find the real reason for this problem, just forcefully ensure
that we don't have the mouse capture when destroying the grid. This at least
allows the complete test suite to run.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:10 +00:00
Vadim Zeitlin
b57655127d Improve error reporting for nested asserts failures in the test suite.
If an assert occurred while handling an exception generated by a previous
assert handler, the information about the original assert was lost even if
though it was more important than the secondary assert. Do preserve and show
the original assert message in this case now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:08 +00:00
Vadim Zeitlin
af184f1d2f Work around wxDateTime::ParseFormat() problem in generic wxDateTimePickerCtrl.
Due to a bug in wxDateTime::ParseFormat(), calling it with wxString::c_str()
currently just crashes, so don't do this in generic wxDateTimePickerCtrl code.
The real fix is, of course, to correct the bug in wxDateTime itself but for
now this at least prevents the crash when executing the test suite. And using
c_str() here is unnecessary anyhow.

See #14214.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:05 +00:00
Vadim Zeitlin
182cad34aa Preserve wxComboBox selection when modifying the selected item in wxGTK too.
This does the same thing as r70018 did for wxMSW but for wxGTK, i.e. it keeps
the combo box item selected when its text is modified.

This fixes [Bitmap]ComboBox unit tests under wxGTK.

See #13769.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:22:01 +00:00
Vadim Zeitlin
b90aca4cba Enable wxComboBox::SetString() test in the widgets sample.
It was disabled because it wasn't implemented for wxGTK at some time in the
past -- but it is implemented now, so there is no reason to not allow testing
it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 23:21:57 +00:00
Václav Slavík
550a0c4154 Don't use ancient -no-cpp-precomp flag on OS X.
See http://trac.wxwidgets.org/ticket/14029 for a discussion of the
problems it causes when using non-Apple compiler. Even for Apple's GCC,
it does nothing these days and we no longer support OS X 10.3, so
there's no point in continuing to use it.

Fixes #14029.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-29 09:36:44 +00:00
Vadim Zeitlin
39258ad796 Make wxGTK code returning correct focus in popup menu presence more robust.
Replace the changes of r69938 with an alternative and simpler solution:
instead of playing games with gs_pendingFocus, which could break down if its
old value became invalid while the menu was shown as happened if one of the
menu commands resulted in this window being destroyed, just take the currently
shown popup menu into account in DoFindFocus() itself.

This should be safer as there is no danger of any dangling pointers here and
is also simpler and more obviously correct.

Closes #14103.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:25:26 +00:00
Vadim Zeitlin
7e7ba0dfc5 Add missing "flags" argument to wxNotificationMessage ctor in wxMSW.
It was impossible to specify the flags when creating wxNotificationMessage in
wxMSW, cotrary to the other ports and the documentation.

Fix this by adding the missing argument to the ctor and simply passing it to
the base class one, we don't have to do anything else as the existing code
already calls GetFlags() later so it should respect these flags without any
more changes.

Closes #14245.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:25:23 +00:00
Vadim Zeitlin
a610eb7369 Fix crash in wxFileConfig when deleting last entry of the root group.
This resulted in keeping a dangling pointer to the group line in
wxFileConfigGroup and any attempt to use it after this resulted in a crash.
Fix this by explicitly resetting the last line in this case.

Also add a unit test for this scenario.

Closes #14243.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:25:19 +00:00
Vadim Zeitlin
586bed9446 Make it possible to forward declare wx{Choice,Tool,Tree}bookEvent again.
Don't use typedef for these classes as it makes it impossible to
forward-declare them, just use #define instead as we already do for
wxListbookEvent and wxNotebookEvent. This allows forward declaration and is
also more consistent.

Closes #12242.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:25:15 +00:00
Vadim Zeitlin
6ce2b9f11f Use generic wxAboutBox() in wxUniv/GTK.
The native GTK implementation is not used in wxUniv/GTK, so don't exclude the
generic one as well.

Notice that the same should be done for wxMSW and wxOSX too but we currently
seem to use the native version even in wxUniv there. It would be better to
consistently use the generic version in all wxUniv ports.

Closes #14236.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:25:07 +00:00
Vadim Zeitlin
c87df234ac Don't change wxTextEntry value if it didn't really change.
This is not only unnecessary but also can result in a kind of infinite loop
when wxTextEntry::SetValue() is called from wxEVT_IDLE handler as really
modifying the text results in another wxEVT_IDLE being generated and another
call to SetValue() and so on while not doing it in the first place completely
works around the problem and is also more efficient.

Closes #13936.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:25:03 +00:00
Vadim Zeitlin
d9abe7f2f9 Run some wxTextCtrl unit test cases for single and multi-line controls.
Some of the tests that were previously ran for single or multi-line controls
only actually apply to both of them, so run them for both kinds of control to
test that both of them work correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:25:01 +00:00
Vadim Zeitlin
358fb6ada6 No changes, just refactor wxTextCtrl unit test case.
Allow running the same tests for both single and multi-line controls easily.
No real changes yet though, the tests are still ran for the controls with the
same styles as before for now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:59 +00:00
Vadim Zeitlin
d4bc7a1601 Recognize wxDefaultDateTime in gdb wxDateTime pretty-printer.
Trying to print an uninitialized/invalid wxDateTime in gdb resulted in an
error (Python exception from datetime module), recognize it specially now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:57 +00:00
Vadim Zeitlin
586c455167 Don't block in wxEventLoopManual::Dispatch() if loop was exited.
If Exit() was called from a handler for one of the pending events we could
reenter Dispatch() and block there indefinitely if no other events were coming
and this was exactly what happened in wxFileSystemWatcher unit test,
preventing it from ever running to completion under Unix.

Fix this by checking m_shouldExit after executing the pending handlers and
before calling Dispatch().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:54 +00:00
Vadim Zeitlin
a6a181a303 Add a gdb pretty-printer for wxFileName objects.
This pretty-printer works by calling the C++ wxFileName::GetFullPath()
directly instead of interpreting the object data from gdb because this is much
simpler to do, so it can only be used when debugging live programs. If this is
a serious restriction, it would need to be changed to use gdb data access only
later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:52 +00:00
Vadim Zeitlin
c8648b64a6 Fix harmless warnings about hiding base class virtual in dialogs sample.
GetTitle() added in r71213 resulted in virtual function warnings from g++, fix
them by renaming it to GetBoxTitle().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:50 +00:00
Vadim Zeitlin
a55602fafa Don't use too big width for wxHtmlHelpWindow navigation panel.
The width of the navigation panel in wxHtmlHelpWindow could become arbitrarily
high if long items used. Avoid this by using a reasonably large but not too
big minimal width instead of determining it automatically from the items width.

Closes #13754.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:47 +00:00
Vadim Zeitlin
49b489e80f Fix erasing wxHtmlWindow background in wxUniv.
Prevent the default wxWindow-level wxEVT_ERASE_BACKGROUND handler from being
used in wxUniv for wxHtmlWindow. This is unnecessary as it has its own handler
anyhow and also doesn't work for some reason as erasing wxMemoryDC by drawing
a solid rectangle over it seems to be broken in at least wxX11.

Work around this problem by erasing the background in wxHtmlWindow itself if
no user-defined (as opposed to any, including one defined in wxWindow itself)
handler for this event exists.

Closes #13880.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:43 +00:00
Vadim Zeitlin
4fbb421ba9 Handle kCGImageAlphaNoneSkipFirst correctly in wxOSX wxBitmap code.
The code tested twice for kCGImageAlphaNoneSkipLast which was clearly wrong.
The original intention was probably to check for both it and
kCGImageAlphaNoneSkipFirst, so fix it to this now.

Closes #14019.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:40 +00:00
Vadim Zeitlin
93be446f3a Fix wxBitmapButton best size calculation in wxOSX/Carbon.
wxAnyButton refactoring broke the best size computation for Carbon, fix it to
work as it did before.

Closes #13830.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:36 +00:00
Vadim Zeitlin
0531b19965 Document the change in wxEVT_SIZE generation for wxDialogs in wxMSW.
These events are now generated earlier and can result in crashes if the
controls they use are not initialized yet.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:34 +00:00
Vadim Zeitlin
586f402336 Document that wxDCClipper currently resets clipping region.
Unlike other similar classes, this one doesn't restore the previous clipping
region but just resets it because there is no way to get the current clipping
region from wxDC now. At least document this limitation until it can be fixed.

See #13834.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:31 +00:00
Vadim Zeitlin
d6256ab96d Added note about WXWIN_COMPATIBILITY_2_6 being off in 2.9 by default.
Also list some concrete symbols which are not available any more and their
replacements.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-27 22:35:08 +00:00
Julian Smart
d022fa4e45 Restored the exact-fit-button horizontal margin calculation from 2.8 since it was too cramped.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-27 11:39:52 +00:00
Robin Dunn
8746b63ff7 Typo fix, and add some missing methods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-26 01:29:00 +00:00
Julian Smart
23698b123b Fixed floating image layout when typing in subsequent paragraph
Now makes use of max size for images and keeps the image size reasonable
Added original image size so can usually avoid reloading image when recomputing
cached bitmap size
Takes into account bottom of the last floating image so scrollbars are
set correctly
Original image size is shown in disabled size controls


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-25 11:42:31 +00:00
Julian Smart
c6182d489c Added custom properties to style definitions and style sheets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-24 11:22:18 +00:00
Paul Cornett
ee1787872d Remove code to find topmost X window in SetTransparent().
The purpose of this code is unknown, but it may be intended to make WM
decorations transparent. But it causes a crash when docking an AUI panel.
And in my testing the decorations are transparent even without this code.
Fixes #4841


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-24 05:38:12 +00:00
Julian Smart
e059e1bb33 Added flags to SetStyle with specific object
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-23 16:54:52 +00:00
Robin Dunn
ac03e0173b Fix missing and broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-21 00:07:31 +00:00
Paul Cornett
3cc04de73e defer queue-resize until after size-allocate processing, to keep it from being ignored by GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-20 16:05:13 +00:00
Paul Cornett
1104248bb5 silence warning about wxOSX_USE_COCOA not being defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-20 15:34:24 +00:00
Robin Dunn
70175534bf Make wxTaskBarIcon's ctor have the same API on all platforms even though setting the icon type can only be done on wxOSX-cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-20 05:41:54 +00:00
Robin Dunn
b83b7724da Document SetDoubleBuffered
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-20 05:41:39 +00:00
Paul Cornett
01a49fd4c4 move widget resize handling from DoSetSize to DoMoveWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-19 17:15:40 +00:00
Paul Cornett
0604cfd7b9 simplify default border code in DoSetSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-19 16:51:06 +00:00
Paul Cornett
4d711190c7 rearrange some code in DoSetSize to facilitate upcoming changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-19 16:44:59 +00:00
Vadim Zeitlin
34670bdafe Fix for wxUniv/GTK compilation.
wxWindowBase needs to be explicitly cast to wxWindow in wxUniv/GTK build but
this wasn't done in the changes of r70597.

Cloes #14235.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-19 16:14:18 +00:00
Vadim Zeitlin
3d0905aba8 Correct wxPaintDC base class in the documentation.
wxPaintDC derives from wxClientDC, not wxWindowDC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-19 16:14:16 +00:00
Paul Cornett
90dcb0d968 Adjust x,y parameters by pizza scroll offset in DoSetSize
This should cause no change in behavior, and is merely preparation for further changes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-18 16:30:11 +00:00
Vadim Zeitlin
6ca243fc75 Don't set focus to hidden window in wxSetFocusToChild().
The window that had focus previously could be hidden now, but its parent could
be hidden as well so it's not enough to set focus to it but we need to loop
until we find a visible ancestor.

Closes #14230.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-18 09:23:05 +00:00
Robin Dunn
34a9a3528f Fix missing and broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-17 17:00:36 +00:00
Stefan Csomor
38274d1de3 avoiding potential mismatch between true and expected state of wxGraphicsContext because it might have been changed through its direct API meanwhile, fixes #14226
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-17 16:57:12 +00:00
Vadim Zeitlin
d60a9c00e4 Add possibility to change the test message box title in dialog sample.
All the other message box elements were configurable, so why not this one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-17 13:57:18 +00:00
Stefan Csomor
95cb88191c building on 10.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-17 06:13:16 +00:00
Paul Cornett
86e73b4397 remove AdjustForParentClientOrigin call, it does nothing in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 15:45:52 +00:00
Vadim Zeitlin
c22118113a Reset hover item when mouse leaves wxAuiToolBar.
The hover item was not reset properly in some circumstances, do it now.

Also check for the item being disabled in SetHoverItem() itself instead of
doing it several times before calling it.

Closes #14189.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 14:33:35 +00:00
Vadim Zeitlin
365d11bec3 Fix wxCairoContext creation from wxWindow under MSW.
cairo_win32_surface_create() must be passed the window HDC and not HWND
itself, the old code calling it was broken.

Add WindowHDC object and pass its HDC to this function now to make it work.

Closes #14194.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 14:30:02 +00:00
Vadim Zeitlin
badf8578b2 Add default ctor to wxMSW private WindowHDC helper class.
Allow to use objects of this class without any valid HWND, this is useful for
the derived classes which may, or may not, need the corresponding HDC.

See #14194.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 14:29:59 +00:00
Vadim Zeitlin
45cecdf943 Fix type mismatch in wxLogTrace() call in wxSocket.
Cast socket handle to a 32 bit value as we use it with "%d" (or "%u" now as it
makes more sense) format specifier to avoid problems with type mismatches
under Win64.

Closes #14204.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 14:19:13 +00:00
Vadim Zeitlin
b7775a521f Add wxFSInputStream providing stream interface to wxFileSystem.
This class allows using virtual wxFSFiles with any wx functions taking
streams. E.g. it makes it possible to load images and animations from
wxFileSystem.

Closes #14185.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 13:53:49 +00:00
Vadim Zeitlin
f5ef4d69b7 Added wxWrapperInputStream class.
This stream allows to wrap another stream. This is a useful base class for
adapter classes providing stream interface on top of something else, like the
upcoming wxFSInputStream.

See #14185.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 13:53:45 +00:00
Vadim Zeitlin
11527fc9f0 Added support for page tooltips to wxAuiNotebook.
Allow setting tooltips for the tabs of the individual pages of wxAuiNotebook.

Closes #14216.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 12:12:26 +00:00
Vadim Zeitlin
86f5e64bb1 Added wxAcceleratorEntry::ToRawString().
This function can be used to obtain language/locale-independent representation
of an accelerator. This is particularly useful for storing it in configuration
files.

Closes #14228.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 12:12:19 +00:00
Vadim Zeitlin
6f3320bf3d No real changes, just some typo fixes for previous commits.
Fix wxCOMPtr comment and don't use "s_" for non-static variable.

Closes #14227.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-16 12:12:15 +00:00
Vadim Zeitlin
580ffdf4c0 Use new style directory selection dialog under Vista and later.
Use IFileDialog in wxDirDialog implementation if possible, it shows a much
more user-friendly dialog than the one used by SHBrowseForFolder().

Closes #11401.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-15 23:18:12 +00:00
Vadim Zeitlin
09278fdb79 Added wxCOMPtr<> helper class.
This allows to avoid error-prone manual AddRef() and Release() calls when
writing COM code in wxMSW.

See #11401.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-15 23:18:08 +00:00
Vadim Zeitlin
23b9814f80 Fix WXK_MENU handling in wxStyledTextCtrl.
Map it to SCK_MENU instead of treating it as a modifier and simply swallowing
it.

Closes #14205.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-15 23:18:05 +00:00
Vadim Zeitlin
eccace042d No real changes, just fix misspellings in comments in wxGTK code.
Also remove a couple of wrong $Id$ expansions.

Closes #14203.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-15 23:18:01 +00:00
Vadim Zeitlin
66180c31f6 Call wxThread::OnExit() from wxThread::Exit() in wxMSW too.
Exit() is documented to call OnExit() and the pthreads version of wxThread did
behave as documented, so make wxMSW follow it as well and explicitly call
OnExit() before exiting the thread.

Closes #14212.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-14 22:37:34 +00:00
Vadim Zeitlin
4b666be659 Add support for VT_I8 (long long) values to wxAutomationObject.
Just map VT_I8 to wxLongLong.

Closes #14210.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-14 22:31:57 +00:00
Vadim Zeitlin
4eeceb1573 Add support for horizontal mouse wheel events to wxGTK too.
Handle GDK_SCROLL_{RIGHT,LEFT} directions in scroll-event handler in wxGTK.

Closes #14221.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-14 22:27:34 +00:00
Vadim Zeitlin
15e42bb781 Fix the check for wxUSE_DATETIME in wxGenericValidator code.
The #endif was somehow added at a wrong place and too much
wxDateTime-unrelated code was disabled when wxUSE_DATETIME was off.

Closes #14222.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-14 22:27:31 +00:00
Stefan Csomor
4e30a4ce57 make sure status item rect in bar is highlighted when clicked, fixes #13630
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-14 07:33:06 +00:00
Steve Lamerton
601d0ba7c6 Always check that we get a valid IDispatch* from get_Document as sometimes the call can succeed but return NULL.
Fixes #14182

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-12 21:15:16 +00:00
Robin Dunn
575821fad8 Add missing interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-12 05:33:29 +00:00
Robin Dunn
c328f9d374 Add missing interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-10 03:27:55 +00:00
Robin Dunn
073b976d01 Fix missing and broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-10 03:27:50 +00:00
Robin Dunn
e5e10e234e Remove the wxPython-only doc snippets from the C++ docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-10 03:27:44 +00:00
Robin Dunn
eb5730bdce Minor tweak to improve understandability
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-10 03:27:28 +00:00
Robin Dunn
be631dbaa0 Add CreateTextSizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-10 03:27:22 +00:00
Vadim Zeitlin
c282e47d8f Always use UTF-8 for file names passed to GTK+ functions under MSW.
When building wxGTK under MSW, always use UTF-8 as file name encoding because
GTK+ doesn't use G_FILENAME_ENCODING there.

Add a helper wxGTK_CONV_FN() macro to hide the difference between the
platforms.

Closes #14035.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-08 18:10:29 +00:00
Vadim Zeitlin
527f168b34 No real changes, just add extra brackets to wxGTK_CONV() macro.
These brackets are probably not really necessary but add them just in case
they can help with parsing some strange expressions and for consistency with
the other wxGTK_CONV_XXX() macros.

See #14035.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-08 18:10:21 +00:00
Vadim Zeitlin
16c0096fef Compilation fixes for Cairo-based wxGraphicsContext code under MSW.
Include MSW-specific headers under MSW to fix various compilation problems
under MinGW.

Closes #14194.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-08 18:10:11 +00:00
Vadim Zeitlin
95aced6193 Fix typo in wxKeyEvent::GetKeyCode() documentation example.
Use GetKeyCode() instead of (undefined) "keycode" variable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-08 13:25:41 +00:00
Vadim Zeitlin
239e6af724 Fix PCH-less compilation of graphicc.cpp under MSW too.
We need to include wx/window.h in all ports, not just wxGTK.

See #14194.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-08 10:10:20 +00:00
Robin Dunn
f2418860fe Add the client and art IDs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-08 00:54:02 +00:00
Robin Dunn
691a621163 Mark which methods are pure virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-07 04:18:28 +00:00
Robin Dunn
3f89cb6071 Document wxHelpControllerBase so the type can be used in Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-07 04:18:23 +00:00
Robin Dunn
848a90b112 wxHtmlHelpController derives from wxHelpControllerBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-07 04:18:16 +00:00
Robin Dunn
895c1bc001 Add a ctor that is compatible with the documented wxHelpController API
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-07 04:18:11 +00:00
Vadim Zeitlin
e5f9b4ae2d Handle Ctrl-O and Ctrl-L MSW wxWebView accelerators too.
Do the same thing for them as for Ctrl-N, Ctrl-F and Ctrl-P, they are also
used by the control.

Closes #14192.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-06 19:51:23 +00:00
Vadim Zeitlin
79ebe32ef1 Remove special setup_gccxml.h for GCCXML.
This file doesn't seem to be needed and the open() declaration in it actually
results in errors when using the latest gccxml from cvs under Windows, so just
get rid of it entirely.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-06 19:51:20 +00:00
Stefan Csomor
396b37294a fixes #14193
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-06 18:07:10 +00:00
Vadim Zeitlin
525454303e Set the menu itself as event object for EVT_MENU_{OPEN,CLOSED} in wxMSW.
Make wxMSW consistent with the other ports and set the menu itself, not the
window it is attached to, as the event object for the menu open/close events.

See #1595.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 22:27:36 +00:00
Vadim Zeitlin
4936c09982 Reuse wxMenu::SendEvent() from wxFrameBase::ProcessCommand().
Not only this avoids code duplication but it also fixes wrong code in
wxFrameBase version as it set the event object incorrectly to the frame itself
instead of setting it to the menu.

Added event object check to the menu events unit test.

Closes #1595.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 22:27:32 +00:00
Vadim Zeitlin
6eca840cc9 Add a very simple unit test checking for menu events.
Just verify that an event with the expected id was generated. The test will be
extended later to test for other event fields such as its source object,
see #1595.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 22:27:29 +00:00
Vadim Zeitlin
1ff3e9aae5 Use wxFrame::FindItemInMenuBar() in ProcessCommand().
Don't duplicate FindItemInMenuBar() code in ProcessCommand() and, more
importantly, use the overridden version of FindItemInMenuBar() in MDI parent
frame in wxMSW to allow using ids corresponding to the active child frame menu
items.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 22:27:26 +00:00
Vadim Zeitlin
cdacccaee8 Don't change the icon when editing wxDataViewIconText cells in generic version.
wxDataViewIconTextRenderer changed the icon to that of the last item drawn by
it when editing a cell. Fix this by getting the original icon directly from
the model instead of from the last item.

Closes #14187.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 18:40:23 +00:00
Vadim Zeitlin
e911dd0a5a Hide combobox popup when it is hidden itself in wxMSW.
It was possible to hide the main part of a combobox control but keep its popup
shown and this notably happened in wxGrid when TAB was pressed while a
wxChoice cell editor was dropped down.

Avoid this Cheshire combobox syndrome by explicitly dismissing the popup when
a combobox is hidden.

Closes #3113.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 18:40:20 +00:00
Vadim Zeitlin
a24fb9f847 Refactor: move wxComboBox::MSWDoPopupOrDismiss() down to wxChoice.
No real changes, just make this method available in wxChoice for the next
commit needs.

See #3113.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 18:40:15 +00:00
Vadim Zeitlin
2415cf6725 Remove support for MetroWerks CodeWarrior compiler.
This compiler doesn't exist any more and was probably unsupported even in 2.8,
let alone 2.9, so remove all the __MWERKS__ tests to simplify things.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 18:40:11 +00:00
Vadim Zeitlin
db414879d4 Remove wrong const from wxMenu::GetMenuItems() documentation.
Only one of the overloads is const.

Closes #14169.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 18:40:00 +00:00
Vadim Zeitlin
88ec47bb12 No real changes, just remove wxIsDebuggerRunning() stub from wxOSX.
There is no need to have a stub here when we already have in wx/debug.h, just
remove it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 18:39:57 +00:00
Vadim Zeitlin
5e0b09554d Fix handling of the main window of composite controls in wxMSW wxToolTip.
The main window itself should be added using DoAddHWND() and not
AddOtherWindow() as it is not, precisely, "other". This fixes removing and
updating it twice unnecessarily.

Closes #14184.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 13:55:56 +00:00
Vadim Zeitlin
f7dd07f64d No real changes, just use clearer names for wxMSW wxToolTip methods.
Rename wxToolTip::DoAddOtherWindow() to DoAddHWND() as it should be used for
adding any window associated with the tooltip, either the main or an auxiliary
one. And rename wxToolTip::Add() to AddOtherWindow() because it shouldn't be
used for the main window.

See #14184.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 13:55:51 +00:00
Vadim Zeitlin
3caee5cfaa Really fix source coordinates handling in wxDC::Blit() in wxMSW.
It turns out that the changes r71028 were unnecessary (and actually harmful)
in most cases, they're only needed when a DIB is used as a source DC. So move
the manual coordinates adjustments to the branch of code using StretchDIBits()
and don't do it anywhere else.

Also don't list this as an incompatible change as wxMSW actually already
worked as the other ports in the majority of cases and list it as a simple bug
fix instead.

Closes #14188.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 13:55:43 +00:00
Robin Dunn
cb9582cdf6 Add wxAffineMatrix2DBase class.
If a class is used somewhere as parameter or return value types then it needs to be documented, at least for Phoenix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-04 23:22:53 +00:00
Vadim Zeitlin
a45c6a892c Fix wxRadioButtons without explicit wxRB_GROUP styles in wxGTK.
If two radio buttons are created consecutively, they should be part of the
same radio group, even if wxRB_GROUP hadn't been explicitly used for the first
of them.

Do this is for consistency with wxMSW and also because the alternative
behaviour doesn't make much sense.

Also stop iterating too far backwards when searching for the group to be used
for a new radio button and add comments explaining what's going on here.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-04 22:30:30 +00:00
Vadim Zeitlin
0408c49fb9 Remove obsolete header used only with CodeWarrior MetroWerks compiler.
This compiler doesn't exist for modern OS X systems, no need to have the
headers used only with it as they just clatter the include directory and
confuse various tools parsing wx headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-04 22:16:24 +00:00
Vadim Zeitlin
589046c0bd Avoid overflowing the wake up when handling events in Unix console apps.
Generating many wake ups from the worker threads could result in overflowing
the buffer of the pipe used to communicate with the main thread which, in
turn, resulted in other serious problems (deadlocks...).

Avoid this by only writing to the pipe if it is empty.

Closes #14166.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-04 14:36:45 +00:00
Vadim Zeitlin
ab66414a66 No changes, just categorize change log entry correctly.
wxThread::SetConcurrency() should be in the non-GUI part, not wxUniv one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-04 14:36:39 +00:00
Vadim Zeitlin
fe1fd8d5d5 Don't link with QuickTime framework in 64 bit wxOSX builds.
This framework doesn't exist in 64 bits and so using it results in a warning
when building 64 bit libraries. Avoid this by omitting it if we are sure that
we target 64 bits only.

Closes #14144.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-03 11:50:23 +00:00
Vadim Zeitlin
771563baee Added wxGraphicsContext::CreateMatrix(wxAffineMatrix2D) overload.
Make it easy to convert generic wxAffineMatrix2D to native wxGraphicsMatrix.

Closes #13188.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-03 11:50:19 +00:00
Jouk Jansen
733fa10b1a Update Makefile for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-03 06:25:03 +00:00
Vadim Zeitlin
c52f18dfc8 Override DoThaw() in wxAuiNotebook correctly.
Don't "override" Thaw() in wxAuiNotebook as it's not virtual any more.
Override DoThaw() instead.

Also use wxBookCtrlBase instead of wxControl as the base class.

Closes #14179.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-02 18:26:03 +00:00
Vadim Zeitlin
554b7d9f8d Document wxStreamBuffer::BufMode enum and fix dtor.
Document the enum as it's used as parameter type by other methods and so needs
to be declared to make the header parsable.

Also fix wxStreamBuffer dtor documentation which was missing a tilde.

Closes #14174.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-02 16:07:44 +00:00
Vadim Zeitlin
1007200e08 Fix wxArrayString::Item() and Last() documentation.
Document both const and non-const versions of the methods.

Closes #14173.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-02 16:07:41 +00:00
Vadim Zeitlin
483b63b3a1 Fix wxURI::HasUserInfo() name in the documentation.
Use the correct name of an existing method instead of HasUser().

Closes #14172.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-02 16:07:38 +00:00
Vadim Zeitlin
214ffcf58d Fix wxTextFile::GetLine() documentation.
Document both const and non-const overloads of this method instead of having
some strange (and non-existent) chimera of the two.

Closes #14171.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-02 16:07:34 +00:00
Vadim Zeitlin
8362ae0a2a Remove wrong consts from wxTextFile::Open() documentation.
Open() is a non-const method.

See #14171.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-02 16:07:31 +00:00
Vadim Zeitlin
91f5965066 Correct the return type of wxPersistenceManager methods in the documentation.
DisableSaving() and DisableRestoring() don't return anything.

Closes #14170.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-02 16:07:28 +00:00
Vadim Zeitlin
e32a6e58ad Document pure virtual wxDropTarget methods correctly.
GetData(), OnData() and OnDrop() were not documented as being pure virtual.

Closes #14165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-02 16:07:24 +00:00
Vadim Zeitlin
5f2f8e027e Vietnamese translations update from Trần Ngọc Quân.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-01 17:27:15 +00:00
Stefan Csomor
b0bb9f2828 correct text drawing with background brush, fixes #14161
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-01 13:37:53 +00:00
Vadim Zeitlin
634034d582 Document wx{Single,Multi}ChoiceDialog styles in class documentation.
The styles should be documented in the class documentation, not the
documentation of individual constructors.

Closes #14162.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-01 10:26:37 +00:00
Robin Dunn
475d0f2475 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-31 04:39:53 +00:00
Robin Dunn
84daa96e61 Add NUM_CUSTOM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-31 04:39:48 +00:00
Robin Dunn
930e34529d Add wxGenericProgressDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-31 04:39:43 +00:00
Robin Dunn
ae0a6d8b14 Add missing dirctrl interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-30 18:29:03 +00:00
Vadim Zeitlin
d02a916ba1 Return run-time zlib version from wxGetZlibVersionInfo().
Return the version really used instead of the version the code was compiled
against.

Incidentally, this avoids the use of ZLIB_VERNUM not available in old (1.1)
versions of zlib, thus fixing compilation under Solaris 10.

Closes #14158.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-30 12:16:58 +00:00
Vadim Zeitlin
33208b4ecb Remove nonsensical custom comparison code from wxDataViewIndexListModel.
This model was comparing its items by their positions in the list instead of
their values for some reason. This broke sorting in wxDataViewListCtrl using
this model and simply didn't make any sense.

Just remove the comparison code from wxDataViewIndexListModel entirely, the
base class version works just fine for it.

Closes #14116.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 23:43:46 +00:00
Vadim Zeitlin
be6b31f34f Restore the correct brush in wxGCDC::GradientFill() methods.
Both GradientFillLinear() and GradientFillConcentric() changed the brush on
the underlying wxGraphicsContext but didn't restore the default brush back.

Closes #14131.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 23:43:43 +00:00
Vadim Zeitlin
65a2074e9c Remove setup0.h files from the list of headers in bakefile.
These headers don't exist in official distributions as they're renamed to
setup.h in them. Moreover, they don't need to be installed anyhow when using
configure as the real setup.h is installed specially, so there is no real need
to have them in the list of headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 23:17:26 +00:00
Stefan Csomor
15ad8a7601 adding tabart.cpp file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 20:05:29 +00:00
Stefan Csomor
7db7138c14 adding tabart.cpp file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 19:59:34 +00:00
Vadim Zeitlin
ed00533b86 Added missing DESTDIR to wx-config installation make rule.
All paths should be prefixed by $(DESTDIR) but it was forgotten in "ln -s"
command.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 19:19:05 +00:00
Robin Dunn
2c033d4a12 wxTreeCtrl interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 17:14:52 +00:00
Vadim Zeitlin
20ebd9ffbf Allow closing wxAuiTabCtrl pages without switching to them.
Clicking on the page "x" close button switched to the page before doing
anything else which was unusual as other tabbed controls don't behave like
this.

Handle clicks on the close button specially and avoid switching to the page
which is about to be closed anyhow.

Closes #14150.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 12:08:05 +00:00
Vadim Zeitlin
22930be86c Fix focus handling logic in generic wxListCtrl.
Don't override SetFocus() to set the focus to the main window, this isn't
enough as we can be given the focus by the underlying toolkit itself, without
our SetFocus() being called -- this happened in wxGTK when focus was changed
from the keyboard using TAB and in this case it didn't get to the main window
but remaining on the wxListCtrl itself meaning that keyboard input wasn't
processed at all.

Use wxNavigationEnabled<> now to ensure that OnSetFocus() and related methods
do the right thing instead now.

Also get rid of OnSetFocus() in wxListHeaderWindow, it's better to override
AcceptsFocus() to return false to avoid getting focus in the first place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-29 00:10:53 +00:00
Steve Lamerton
34326da778 Minor changes, just trim trailing spaces in webview code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-28 18:00:30 +00:00
Vadim Zeitlin
324ab5e2db Document that wxDateTime::UNow() returns UTC time.
This wasn't clear and was probably surprising as this is different from Now()
behaviour.

See #14149.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-28 11:29:40 +00:00
Stefan Csomor
1e9e4113e9 adding correct behavior for move events as the are issued under OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-28 09:13:40 +00:00
Steve Lamerton
e81ef29720 Correctly use QueryInterface in GetDocument to ensure that we only return an IHTMLDocument2 pointer if one is available. Check GetDocument being NULL when used. This fixes the displaying of non-html documents such as pdfs.
Fixes #14060

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-27 19:33:59 +00:00
Robin Dunn
0ffc170455 Add missing interface items for listctrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-27 17:28:56 +00:00
Vadim Zeitlin
6f26e88002 Honour source wxDC coordinate system in wxDC::Blit() in wxMSW.
wxGTK and wxOSX already did this so do it in wxMSW as well.

Update the documentation to make this explicit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-27 12:28:04 +00:00
Vadim Zeitlin
825842b411 Make wxDC::Blit() and StretchBlit() documentation more useful.
Enumerating the list of parameters in the method description is not especially
helpful, don't do it. Explain the functions relationship instead.

Also don't say that StretchBlit() is not implemented in wxGTK because it does
work there (using the generic implementation using wxDC scale).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-27 12:28:01 +00:00
Vadim Zeitlin
90761420ee Set wxTextAreaBase::m_filename in the methods of this class itself.
m_filename member was declared in wxTextAreaBase but set only in the
overridden wxTextCtrlBase methods. This meant that it wasn't updated correctly
in wxStyledTextCtrl which also derives from wxTextAreaBase and so saving
SaveFile() with empty file name didn't work there even when the control had
been originally loaded from a file.

Move the code updating m_filename to wxTextAreaBase itself to fix this. This
also simplifies the code as it's now not necessary to override
Do{Load,Save}File() in wxTextCtrlBase at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-27 11:58:09 +00:00
Vadim Zeitlin
dace99a4ef Use IsDescendant() in wxTopLevelWindow::IsActive() implementation.
Avoid wxGetTopLevelParent() which doesn't work for the strange TLWs which
override IsTopLevel() to return false, as wxMDIChildFrame does in wxMSW.
Using IsDescendant() works in any case and also is arguably more clear.

Closes #3063.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-27 11:58:05 +00:00
Vadim Zeitlin
8b2f64c6c1 Added wxWindow::IsDescendant() helper.
This function checks if another window is a direct or indirect child of this
one, which can be needed in a number of situations.

See #3063.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-27 11:58:02 +00:00
Julian Smart
ed98f424de Corrected scale factor for the use of DC PPI instead of printer PPI in wxRTC code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-26 16:57:05 +00:00
Paul Cornett
55a0fa4e54 non-pch build fix, closes #14140
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-26 15:44:31 +00:00
Vadim Zeitlin
11c2d6d3bc Arabic translations update from Fatma Mehanna.
Also backport the translations to 2.8 branch.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-26 11:52:14 +00:00
Vadim Zeitlin
ba3b628e8f No changes, just small cleanup in AUI GTK tab art drawing code.
Use more clear variable names; remove commented out assignments to inexistent
variables.

Closes #14139.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-26 11:24:01 +00:00
Vadim Zeitlin
ce0092d71f Fix gap box coordinates in GTK AUI tab art code.
Closes #14138.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-26 11:23:58 +00:00
Vadim Zeitlin
0d57a51305 Minor fix to wxGraphicsContext::SetInterpolationQuality() in wxMSW.
Only update the internal variable if we really succeeded in changing the
interpolation mode.

See #14134.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-26 11:23:54 +00:00
Paul Cornett
6b1f115551 remove unneeded includes and forward declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 23:34:42 +00:00
Paul Cornett
a99e147a5c remove unused variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 23:33:43 +00:00
Paul Cornett
54195d23c2 replace wxBitmap::SetPixbuf() with wxBitmap ctor taking pixbuf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 23:33:18 +00:00
Vadim Zeitlin
b05875c977 Fix generic wxTimePickerCtrl on DST change dates.
Do not use the date when DST changes as the date part of wxDateTime object
used by wxTimePickerGeneric internally as this introduces problems with times
that can't be represented at all -- and so can't be entered into the control.
Use arbitrary date on which DST does not change to avoid this.

Closes #14137.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 23:17:04 +00:00
Vadim Zeitlin
c0795ce8ea Added wxTimePickerCtrl::GetTime() and SetTime().
These methods, taking broken down time representation, avoid the problems
arising due to DST complications when using wxDateTime to represent the time
as special care needs to be taken in this case to avoid using the date part
corresponding to a DST change date at which time is discontinuous.

Document the problem with the old functions and use the new ones in the
sample.

See #14137.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 23:17:01 +00:00
Paul Cornett
25d7cf54f0 build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 19:15:54 +00:00
Vadim Zeitlin
069358b7cc Implement native tab art for wxAUI in wxGTK.
Use native wxAuiTabArt implementation in wxGTK, it better conforms to the
system style.

Closes #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 17:56:04 +00:00
Vadim Zeitlin
4758baf5eb Refactor wxAUI: extract wxAuiTabArt in a separate file.
No real changes, just extract wxAuiTabArt into its own file. Also rename
wxAuiDefaultTabArt to wxAuiSimpleTabArt in preparation for having other tab
art classes as the default one.

See #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 17:55:59 +00:00
Vadim Zeitlin
445a98c7d2 Explicitly include wx/aui/dockart.h from the file needing it.
src/aui/tabmdi.cpp needs wxAuiDockArt declaration as it uses it, don't rely on
wx/aui/dockart.h being included from other wxAUI headers and include it from
here explicitly.

See #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 17:55:52 +00:00
Vadim Zeitlin
740dd154a5 Add a private GetNotebookWidget() accessor to wxGTK.
This is similar to the other existing functions and allows to access
GtkNotebook-specific style.

See #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 17:55:49 +00:00
Vadim Zeitlin
5c26126c14 Export wxGTK private widget creation functions from core library.
This is necessary to allow using them from other libraries, e.g. wxAUI that
will do it in the upcoming commits.

See #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 17:55:45 +00:00
Vadim Zeitlin
2970f22a89 Include <wx/textctrl.h> from <wx/combobox.h> for compatibility.
The wxComboBox header itself doesn't need <wx/textctrl.h> but there exists
code using wxComboBox with wxTextCtrl styles and events that doesn't include
<wx/textctrl.h> explicitly because it wasn't necessary in 2.8. So include it
from wx/combobox.h to avoid breaking this code after an upgrade to 2.9.

Closes #14132.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 17:55:42 +00:00
Vadim Zeitlin
f17ac57417 Return valid pointers from wxDateTime::ParseXXX() with non-wxString strings.
The pointer returned by wxDateTime::ParseXXX() methods could point into a
buffer of a temporary wxString created to wrap a char* or wchar_t* argument so
dereferencing it was illegal.

Fix this by defining separate overloads for char*/wchar_t* arguments returning
pointers into the original string.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 16:45:53 +00:00
Vadim Zeitlin
52dc2108ae Add helper wxString::IterOffsetInMBStr() method.
This method can be used to recover the pointer in char* buffer containing
multi-byte string representation corresponding to the given iterator which is
useful for implementing backwards-compatible functions that must be able to
return such pointers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 16:45:50 +00:00
Vadim Zeitlin
9d98c19792 Correct Eric Jensen name in the change log.
See #14134.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 12:14:53 +00:00
Vadim Zeitlin
4323bbde8d Fix bug with parsing time formats during DST periods.
wxDateTime::ParseFormat() used todays date as fall back when parsing all
formats, including those involving times, which meant that its results
depended on whether DST was active at the time of the parsing which was
clearly wrong.

Fix this by using a fixed date on which DST is known not to be active as fall
back date.

This fixes unit test failures in DateTimeTestCase::TestTimeFormat() when it
was ran on a DST transition date.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 00:31:47 +00:00
Vadim Zeitlin
14f3866748 Add a gdb pretty printer for wxDateTime.
Format it using Python datetime module in the standard ISO notation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-25 00:31:38 +00:00
Vadim Zeitlin
ce84ef6a7f Allow hiding rows in wxGrid with HideRow().
HideRow() was simply ignored as SetRowSize(row, 0) didn't do anything. Check
for the special value of 0 and allow it, just as it was done for the columns
since r57336.

See #14133.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-24 18:24:19 +00:00
Vadim Zeitlin
c3562311c8 Implement wxGraphicsContext::SetInterpolationQuality() for wxMSW.
Provide implementation of the previously stubbed out method.

Closes #14134.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-24 18:24:15 +00:00
Paul Cornett
3f6439ae66 avoid reported problem with RHEL 5 GTK+ 2.10 where selection is reset by a clipboard callback, closes #13277
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-23 16:50:13 +00:00
Vadim Zeitlin
42e86f64b7 Don't cache incorrect length in wxString::DoUngetWriteBuf().
The length here is the size of the buffer in bytes and is not necessarily the
string length in code points (notably not for non-ASCII strings in UTF-8
build).

Closes #14130.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-23 15:13:16 +00:00
Vadim Zeitlin
556a836e0f Don't cache incorrect length in wxString::assign(char*, size_t).
The length of the string here is specified in bytes and is not the same as the
string length for non-ASCII UTF-8 strings, so don't cache it as the string
length.

Just invalidate the cached length instead as we simply don't know what the
real length of the string is going to be.

See #14130.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-23 15:13:13 +00:00
Vadim Zeitlin
bd42a07c7a Fix caching wrong length in wxString(str, len) ctor in UTF-8 build.
A length greater than that of the source string could be passed to this ctor.
This worked correctly, i.e. created a string which was a copy of the source
one but cached a wrong length for it.

Avoid this by explicitly checking the length before caching it in
wxString::assign(str, len).

See #14130.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-23 15:13:08 +00:00
Jouk Jansen
d1485d8177 update setup for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-23 09:30:14 +00:00
Paul Cornett
8e98dabce4 fix building with GTK+ < 2.8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-22 18:09:43 +00:00
Vadim Zeitlin
b9e52a19e6 Implement horizontal mouse wheel events support for wxMSW.
Handle WM_MOUSEHWHEEL messages and translate them to the corresponding
wxMouseEvents.

Closes #14105.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-22 00:27:02 +00:00
Vadim Zeitlin
41469c9e5e Use enum for wxMouseEvent::m_wheelAxis instead of int.
This variable can take only 2 values, use symbolic names for them instead of
difficult to understand 0 and 1.

See ##14105.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-22 00:26:59 +00:00
Vadim Zeitlin
32632baf6d Use pthread_setconcurrency() in wxThread::SetConcurrency().
Use POSIX function if available instead of only using Solaris-specific
thr_setconcurrency() which is not found in modern Linux systems any more.

Closes #2115.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-22 00:12:40 +00:00
Robin Dunn
84484a8ddd Avoid assert when deleting columns if there is more columns than there are column labels
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-21 16:42:00 +00:00
Vadim Zeitlin
8d241dea5c Fix display of "const" methods in wxGTK assert dialog.
Don't separate the function name and its arguments types in 2 different
columns in the assert dialog, this doesn't really work with const methods as
"const" can't be separated from the function like this. The old code just
didn't take "const" into account at all and mangled all the const methods by
showing ") cons" (no typo) at the end.

Just show everything in one column to avoid the problem and also simplify the
code.

Closes #14104.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-21 00:11:12 +00:00
Vadim Zeitlin
996de8322b Remove empty and unnecessary wxFontDialogBase destructor.
This fixes build with wxUSE_FONTMAP==0 as this dtor was only defined inside
"#if wxUSE_FONTMAP" section. Instead of fixing this, just get rid of this dtor
entirely as it was unnecessary anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-20 23:31:25 +00:00
Vadim Zeitlin
a4087a4324 Fix wxMSW compilation when wxUSE_FONTMAP==0.
Don't use wxFontMapper::GetEncodingName() in wxFontEnumerator if wxFontMapper
is not available.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-20 23:26:39 +00:00
Paul Cornett
2d13e22fbf make wxMask pixmap member private
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-20 23:07:33 +00:00
Robin Dunn
045517bea5 Document steps needed to update to newer Scintilla. (From memory, will need to be reviewed while actually doing an update to find other things that should be done.)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-20 20:53:15 +00:00
Paul Cornett
140371064e Fix keyboard navigation broken in r70324, see #14084
Also fixes some other keyboard navigation problems, closes #2849


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-20 03:34:18 +00:00
Jouk Jansen
01edb63741 Updates for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-19 13:41:28 +00:00
Vadim Zeitlin
6d1bebabf9 Define wxUSE_TASKBARICON_BALLOONS as 1 for wxMSW builds using configure.
Defining it as 1 is better than not allowing to set it at all and this setting
is not important enough to warrant its own command-line configure option.

Closes #14106.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-19 12:53:32 +00:00
Vadim Zeitlin
2392b8e871 Fix wrong wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK name in the docs.
It was spelt with an extra "ED" at the end.

Closes #14109.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-19 12:53:28 +00:00
Vadim Zeitlin
9b98a2bcfd Fix appearance of items without icons in wxDataViewCtrl in wxOSX/Cocoa.
We need to set the cell image to none explicitly if the item doesn't have any,
otherwise the image for the previous cell would be reused.

Closes #14112.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-19 12:53:25 +00:00
Vadim Zeitlin
9de49b112f Explicitly cast size_t to int to suppress MSVC warnings.
Implicit size_t-to-int conversions provoke warnings when building 64 bit
version (in which sizeof(size_t) > sizeof(int)) with MSVC, so make them
explicit as the size_t values used here will always fit in int range.

Closes #14113.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-19 12:53:21 +00:00
Julian Smart
148d83b59f Added a parameter to PrintBuffer and PrintFile to allow silent or prompted printing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-18 23:25:39 +00:00
Vadim Zeitlin
27abbc9dd2 Brazilian Portuguese translations update from Felipe.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-18 21:17:07 +00:00
Julian Smart
216b59c66a Added wxPropertyGridManager::SetPageSplitterLeft
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-18 20:35:01 +00:00
Stefan Csomor
977b5d7d8e fixes #14110
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-18 18:06:56 +00:00
Vadim Zeitlin
76cae7cbc2 Avoid crashes in wxMSW when using buttons without valid parent.
Child controls such as buttons are supposed to always have a valid parent but
if, somehow, they don't, still don't crash in wxMSW button code but just
trigger an assert failure instead of unavailable button top level parent
instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-18 01:35:53 +00:00
Robin Dunn
37e4846697 fix compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-17 20:42:28 +00:00
Stefan Csomor
4d3b8623ad avoid shortcut ampersands in button text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-17 10:52:34 +00:00
Robin Dunn
508c5afeae Remove --mac_arch and enable --mac_universal_binary to accept one or more architectures instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-17 02:55:36 +00:00
Robin Dunn
5138f38580 Make Dismiss() virtual.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-17 02:55:30 +00:00
Vadim Zeitlin
f9c2e12fff Improve wxListCtrl::SetItemState() documentation.
Better explain the meaning of its parameters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-15 23:24:41 +00:00
Vadim Zeitlin
9827ce9208 Enable/disable "Window" menu items in AUI MDI correctly.
Add EVT_UPDATE_UI handlers for "Close", "Close All" as well as "Next" and
"Previous" menu commands.

Closes #14102.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-15 13:49:54 +00:00
Vadim Zeitlin
d361ea0db5 Pass the original format to wxDataObjectSimple in wxDataObjectComposite.
Some "simple" data objects, such as wxTextDataObject, are actually not simple
and support multiple formats so pass the real format to them so that they
could do the right thing.

Closes #14101.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-15 13:49:49 +00:00
Vadim Zeitlin
5dbdae465b Italian translations update from Roberto Boriotti.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-15 13:14:07 +00:00
Vadim Zeitlin
e59a888c4d Basque translations update from Xabier Aramendi.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-15 13:14:04 +00:00
Vadim Zeitlin
e3f54c8f7c Implement wxDirDialog:: and wxFileDialog::Create() in wxGTK.
Simply move the code from non-default constructor to Create(). This allows to
create the dialogs using 2-step creation if necessary.

Closes #14069.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-14 12:32:27 +00:00
Julian Smart
4cfe5fa88a Better border style for HTML window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-13 17:43:55 +00:00
Julian Smart
67d3242ada Don't scale 16x15 to 16x16 - fixes corruption of bookmark icons in help window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-13 17:23:58 +00:00
Julian Smart
374ce55dca Ensure IDs don't clash with wxRichTextCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-13 17:22:58 +00:00
Julian Smart
a64f38d674 Fixed size calculation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-13 08:42:03 +00:00
Julian Smart
98742322cd Added wxRIBBON_PANEL_FLEXIBLE flag to allow toolbars to wrap, taking up the optimum amount of space when used in a vertical palette.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-12 19:30:10 +00:00
Stefan Csomor
4f134f0cf8 remove 10.4 compatibility code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-12 17:47:18 +00:00
Steve Lamerton
1e0b0d7c55 Add new WX_ASSERT_EVENT_OCCURS macro to improve behaviour of testing asynchronous events. Use it in the wxWebView tests and re-enable previously failing tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-12 14:57:44 +00:00
Julian Smart
7f6cf37004 Removed redundant DoEnable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-12 11:42:49 +00:00
Vadim Zeitlin
a9ed8caa09 Update the text part of combobox when changing text of selected item in wxGTK.
Add a call to SetValue() to wxComboBox::SetString() in wxGTK if the item being
changed is the currently selected one. The new behaviour is consistent with
wxMSW and also makes more sense.

Document it too to remove any doubts about what is supposed to happen in this
case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 23:55:19 +00:00
Vadim Zeitlin
dfb4176ac5 Add a test for wxComboBox::SetString() to the widgets sample.
This allows to easily test this function interactively, notably check what
happens when the currently selected string is changed under different ports.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 23:41:27 +00:00
Vadim Zeitlin
30dc2e865b Remove duplicate wxSYS_DCLICK_MSEC in wxSystemMetric documentation.
Closes #14093.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 23:41:23 +00:00
Vadim Zeitlin
daf1cbe443 Document wxGridCellCoords class.
Closes #14092.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 23:41:20 +00:00
Vadim Zeitlin
fb5117ce44 Document wxBK_HITTEST_XXX values.
They were previously implicitly documented in HitTest() itself but this was
insufficient for wrappers generation as the constants themselves were never
declared. Do define them now and also correct and update their descriptions.

Closes #14091.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 23:41:16 +00:00
Vadim Zeitlin
662ba87479 Document wxHelpSearchMode enum and its values.
Closes #14090.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 23:41:13 +00:00
Vadim Zeitlin
2ccd2adc16 Fixes to function signatures in wxDataViewCtrl documentation.
Change the return type of {Append,Insert,Prepend}Column() to bool and add
missing "const" to Compare().

Closes #14089.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 23:41:09 +00:00
Steve Lamerton
e7aa703d4b Delete buttons when we are finished so they do not overlap later controls and cause test failures.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 15:27:40 +00:00
Steve Lamerton
744d91d41f Move getting the unit test event count from wxTestableFrame to the EventCounter class. This reduces the need to have wxTestableFrame pointers all over the unit testing code and should reduce bugs caused by counting the wrong events.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 14:32:24 +00:00
Julian Smart
6c6b938377 A fix for flicker when the top-level window is disabled or enabled (e.g. by modal dialogs).
Achieved by using IsThisEnabled to determine the visual disabled state and thus requiring no refresh on top-level window enabling/disabling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-11 05:31:06 +00:00
Paul Cornett
b2596741a2 remove unused parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 16:58:05 +00:00
Vadim Zeitlin
6fbdd267e5 Fix wxComboCtrl::SetHint() return type in the documentation.
It is now bool, not void, as for wxTextEntry::SetHint().

Closes #14083.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 14:26:26 +00:00
Vadim Zeitlin
f7754d0fde Explicitly document wxMessageOutputFlags.
They were already mentioned in wxMessageOutputBest ctor documentation but now
add the standalone enum too to make the documentation header semantically valid.

Closes #14082.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 14:26:22 +00:00
Vadim Zeitlin
cda7699df7 Document wxPrintQuality and wxPRINT_QUALITY_XXX constants.
Closes #14081.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 14:26:18 +00:00
Vadim Zeitlin
6b5bdf3764 Fix wxDataObject::GetFormatCount() signature in the documentation.
It should be const but wasn't.

Closes #14080.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 14:26:15 +00:00
Stefan Csomor
3a17676321 using 10.5 API for cursor updates as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 13:13:51 +00:00
Stefan Csomor
94734b4e51 removing NSWindow based mouse tracking in favour of 10.5+ trackingArea implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 12:37:58 +00:00
Robin Dunn
b23ea17884 Document the non-deprecated version of InsertTool, and some other tweaks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 00:01:15 +00:00
Robin Dunn
f2b6dd8c50 Make the CreateTool factories be public so they can be used from application code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 00:01:09 +00:00
Robin Dunn
db51298a74 Add wxToolBarToolBase, missing flags, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-10 00:01:00 +00:00
Julian Smart
8d3d5f067a Added wxRIBBON_PANEL_STRETCH to allow a single panel to stretch to fill the parent page.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-09 15:26:37 +00:00
Stefan Csomor
14919c7020 reflect correct position for native toolbar, fixes #14049
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-09 12:49:59 +00:00
Vadim Zeitlin
c1a9bcfbc5 Correct the test for wxHAS_IMAGES_IN_RESOURCES in listctrl sample.
wxHAS_XXX symbols need to be checked with #ifdef, not #if.

See #1614 (as this change was part of the patch submitted there, even if the
ticket itself is unrelated).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-09 10:12:43 +00:00
Vadim Zeitlin
1862529285 Exclude wxMSW-only code from wxUniversal build under Windows.
wxListCtrl::EndEditLabel() isn't available in wxUniv, it's wxMSW-only.

This fixes the sample compilation in wxUniv/MSW build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-09 10:12:40 +00:00
Paul Cornett
12612f29d4 add the usual default parameter for Show()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-09 05:50:58 +00:00
Vadim Zeitlin
1f29ecb357 Check for iterator validity when parsing "%%" in wxDateTime::Format() too.
This is similar to the previous commit and adds another missed check for the
iterator not being at the end of string.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-09 01:09:25 +00:00
Vadim Zeitlin
649148f93e Check for end of string when parsing "%z" in wxDateTime::Format().
We could dereference an invalid iterator when parsing "%z", check for this in
the code and add a unit test for this case.

Closes #14075.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-09 01:09:20 +00:00
Paul Cornett
be88fea9ea adjust Blit destination rect if source rect is clipped
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-08 17:06:06 +00:00
Paul Cornett
32b183b578 fix incorrect tests of wxUSE_ macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-08 16:45:17 +00:00
Stefan Csomor
6fc8ad6d53 removing unnecessary hook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-08 15:48:51 +00:00
Stefan Csomor
20111900fa removing 10.4 code, adding webkit trick for showing dynamic tooltips
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-08 15:37:40 +00:00
Vadim Zeitlin
c0430d964d Added wxSplitterWindow::SetSashInvisible() and IsSashInvisible().
Also fix handling of wxSP_NOSASH.

Closes #14074.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-08 13:23:39 +00:00
Vadim Zeitlin
81f2b2ee81 Revert the zoom direction on Ctrl-mouse wheel in wxStyledTextCtrl.
The direction of the zoom in wxSTC didn't correspond to the usual conventions
which is to zoom in on Ctrl-Wheel-Up and zoom out on Ctrl-Wheel-Down, while
wxSTC did exactly the converse. Change it to behave as everybody else.

Closes #14031.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-08 13:23:34 +00:00
Vadim Zeitlin
e94f303173 Deprecate wxWindow::MakeModal().
Using this function was never the right way to show a modal window and it
didn't really work correctly. Instead of futilely trying to fix it, just
deprecate it.

Closes #1561.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-07 23:50:21 +00:00
Václav Slavík
fca74306c5 Don't eat unhandled events in wxHtmlWindow::OnKeyUp().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-07 16:15:11 +00:00
Julian Smart
26412151db When SetSplitterLeft measures all pages, it should also set the splitter for all pages.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-07 12:21:20 +00:00
Julian Smart
69f270e0f3 wxCB_SORT not currently supported on OSX/Cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-06 16:59:39 +00:00
Vadim Zeitlin
72dc73023f Mention the limitations of wxDC::GetPixel() and FloodFill() in wxGTK.
These methods can't be used directly on wxPaintDC in wxGTK and it doesn't seem
possible to fix this so just document this limitation.

Closes #14067.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-06 14:19:29 +00:00
Stefan Csomor
c118fa5f20 catching veto AND handled events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-06 13:18:22 +00:00
Stefan Csomor
0cbcb12d8f adapting grid-cell dragging according to discussion on wx-dev along the behaviour of treecontrolg
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-06 10:23:44 +00:00
Paul Cornett
e0564c1c2f fix test for transparent pen broken in r65820
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-06 04:51:40 +00:00
Paul Cornett
d9a1b21859 avoid using wxDC::Blit() and wxDC::GetPixel() on window that is being painted, results are unpredictable on wxGTK
see #14067

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-06 04:26:33 +00:00
Julian Smart
944a0ae011 It should be possible to set a null bitmap without asserting due to change of size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-05 18:26:20 +00:00
Julian Smart
a74fd54602 Restored correct RTTI for wxNotebook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-05 18:00:34 +00:00
Vadim Zeitlin
483bf4a629 Override InheritAttributes() to do nothing in wxNonOwnedWindow.
Non owner windows shouldn't inherit attributes from their parent. This wasn't
a problem in wxMSW where InheritAttributes() was never called for them but was
in wxGTK (and possibly other ports) where dialogs inherited font from their
parent.

Closes #2766.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-05 13:00:57 +00:00
Vadim Zeitlin
bddea8d14f Override AdjustForParentClientOrigin() in wxNonOwnedWindow to do nothing.
No real changes, just replace an IsTopLevel() check in the base class
implementation of AdjustForParentClientOrigin() and override it for all top
level windows in wxNonOwnedWindow instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-05 13:00:55 +00:00
Vadim Zeitlin
c6907dcd41 Remove the wrong "std::" scope prefix before ceil() call.
Fix compilation errors with VC6 (and possibly other compilers) introduced in
r70797 (see #13383): as we only include <math.h> and not <cmath> we don't
necessarily have std::ceil() available, only the extern "C" ceil(). Just use
the latter instead of the former.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-05 13:00:51 +00:00
Stefan Csomor
637ea0080f coordinate conversion was the wrong way round
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-05 06:10:19 +00:00
Paul Cornett
0a7e80ec29 remove unnecessary includes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 23:50:35 +00:00
Vadim Zeitlin
bb5a951418 Use __WINDOWS__ for OS checks and __WXMSW__ for GUI checks (round 2).
This is continuation of r70796 and serves the same purpose.

Closes #14065, #14066.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 20:31:42 +00:00
Vadim Zeitlin
3a1ec1d5dc Add wxEVT_AUI_PANE_ACTIVATED event.
This event is sent when an AUI pane becomes active.

Closes #14026.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 20:31:34 +00:00
Vadim Zeitlin
fc5a609912 No changes, just make wxAUI SetActivePane() a member function.
Make a global function a member one as it uses member variables and it's
easier to use them directly instead of passing the object pointer to it all
the time.

See #14026.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 20:31:29 +00:00
Stefan Csomor
87381108c8 we have to export every virtual method in this template class for clang, next attempt to get a vc++ compatible solution
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 09:42:51 +00:00
Vadim Zeitlin
865dab5da9 Revert the addition of WXDLLIMPEXP_CORE to all wxNavigationEnabled methods.
This reverts commit r70787 as it broke DLL build with MSVC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:43:19 +00:00
Vadim Zeitlin
acfe040282 Turkish translations update from Kaya Zeren.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:31:36 +00:00
Vadim Zeitlin
d890beb9c8 Use standard IDC_CROSS cursor in wxMSW.
There doesn't seem to be any reason to prefer our own WXCURSOR_CROSS to it.

Closes #13035.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:58 +00:00
Vadim Zeitlin
1580a10d87 Always provide wxMenuItem bitmap-related methods in wxMSW.
Define these methods even when wxUSE_OWNER_DRAWN is turned off for some
reason. This allows to avoid ugly tests for !defined(__WXMSW__) ||
wxUSE_OWNER_DRAWN in the code that just wants to set a bitmap for a menu item.

Closes #12664.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:55 +00:00
Vadim Zeitlin
a02b2a9d31 Don't set value unnecessarily in wxSpinCtrl::Create() in wxMSW.
This is not only unnecessary but also results in an unexpected event (which
could be avoided by using ChangeValue() but why bother calling it at all if we
don't need to).

Closes #13589.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:51 +00:00
Vadim Zeitlin
bcdeea5a5b No changes, just add wxSpinCtrl::Init() to wxMSW.
Remove a "TODO" comment about adding it and initialize all member variables
there instead of doing it only in Create().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:48 +00:00
Vadim Zeitlin
76c6713102 Fix stretchable spaces in wxToolBar after tool removal in wxMSW.
The stretchable spaces need to be manually updated after removing a tool from
the toolbar.

Closes #13577.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:44 +00:00
Vadim Zeitlin
0c827c6eef Correct mouse event coordinates in wxMSW wxUIActionSimulator.
The rounding of the floating point division was not done quite correctly.

Closes #13383.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:37 +00:00
Vadim Zeitlin
d98a58c543 Use __WINDOWS__ for OS kind checks and reserve __WXMSW__ for GUI toolkit.
This change prepares the way for using wxGTK under Windows as this would
still define __WINDOWS__ but use __WXGTK__ instead of __WXMSW__.

Closes #14064.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:31 +00:00
Vadim Zeitlin
2e3407de5c Fix assert when editing an item in multi-selection wxTreeCtrl.
Don't use GetSelection() in wxTreeCtrl EVT_CHAR_HOOK handler as it can only be
used with single selection controls and results in an assert when used with
multi-selection ones. Simply use GetFocusedItem() instead.

Closes #14062.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:21 +00:00
Vadim Zeitlin
e18a74e240 Take disabled windows into account in wxFindWindowAtPoint() in wxMSW.
Use ChildWindowFromPointEx(CWP_SKIPINVISIBLE) to ensure that we find the
disabled children (by not using CWP_SKIPDISABLED).

Add a unit test to check for the correct behaviour in all cases and document
it.

Closes #2942.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:17 +00:00
Vadim Zeitlin
7cd60fb938 No changes, just cleanup TopLevelWindowTestCase unit test a little.
Remove the unnecessary overrides of setUp() and tearDown().

Also get rid of trailing whitespace.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:14 +00:00
Vadim Zeitlin
68a8473f93 Add documentation of wxFileSelectorEx() and wx{Load,Save}FileSelector().
Document all wxFileDialog-related functions and not just wxFileSelector().

See #14051.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:11 +00:00
Vadim Zeitlin
0b59366faa Better documentation for the default parameters values.
Use symbolic names for them and document them separately.

Closes #14051.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:07 +00:00
Vadim Zeitlin
3285e9a347 Fix showing MDI child from wxDocManager::ActivateDocument().
This fix has 2 components: first, call Raise() instead of simple SetFocus()
from ActivateDocument() as this corresponds better to what we want to do here.
And second, override Raise() to call Activate() in wxMDIChildFrame to ensure
that it works as expected as raising an MDI child doesn't work otherwise in
most ports (with the exceptions for wxOSX which, on the contrary, needs a
small fix to preserve the existing working Raise() behaviour).

Closes #13946.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:03 +00:00
Vadim Zeitlin
e709239889 Use wxHAS_IMAGES_IN_RESOURCES instead of explicit platform checks.
Add a special symbol which is defined only if the icons and other images (e.g.
cursor) are in the separate resource files and don't need to be embedded as
XPMs in the main program.

This makes the checks more clear and more customizable as it's enough to
change wxHAS_IMAGES_IN_RESOURCES definition instead of changing many platform
checks.

Closes #14050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:28:58 +00:00
Vadim Zeitlin
b303fca714 Czech translations update from Zbynek Schwarz.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-03 20:23:46 +00:00
Stefan Csomor
778df99f55 we have to export every virtual method in this template class for clang
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-03 17:30:32 +00:00
Stefan Csomor
1788a5f954 just in case we have an erroneous character on the server as well at the end of this file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-03 13:09:54 +00:00
Stefan Csomor
843ac6c8dc testing another implementation for avoiding WakeUp Problems within tracking loops
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-03 10:36:03 +00:00
Vadim Zeitlin
d03a63e465 Add Tamil translations by DINAKAR T.D.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-02 22:26:24 +00:00
Robin Dunn
e73d7e569f fix missing and broken items in the datetime interface
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-02 21:51:21 +00:00
Julian Smart
c375936db8 Darker border for wxComboCtrl on Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-02 12:43:39 +00:00
Julian Smart
b4e415df52 Use a non-native toolbar on Mac so small buttons aren't stretched horribly.
The style combo control also appears now that the toolbar is non-native.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-02 08:55:25 +00:00
Stefan Csomor
9f24a90e2b adding translation of NSDragOperationGeneric to wxDragCopy fixes #14059
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-02 07:17:45 +00:00
Julian Smart
990952304c Improved the appearance of the property grid checkbox on Mac and GTK+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 18:52:38 +00:00
Paul Cornett
7cf17ea27b remove signal-blocking variable, instead just connect to signal when ready
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 16:44:31 +00:00
Paul Cornett
4c9bde5ec0 use m_ prefix for web_view member, and make it a WebKitWebView* to eliminate many casts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 16:36:58 +00:00
Paul Cornett
d3e592af7f remove extra g_object_ref() on web view widget
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 16:14:27 +00:00
Julian Smart
6062fe5c9e Added MacInternalOnSize() to allow windows to resize themselves independently of size events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 15:04:42 +00:00
Paul Cornett
f8497215c1 Fixes to allow running with 64-bit wxGTK
- use correct printf format specifiers
- don't perform operations requiring a window until the window has been created


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 07:09:43 +00:00
Stefan Csomor
0309327e97 applying Andrew's patch, closes #13440, fine now that we have raised the minimum deployment to 10.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 07:09:29 +00:00
Vadim Zeitlin
2a408a4bf2 Add wxGCDC benchmarks to graphics benchmark for comparison with wxDC.
Also benchmark rectangles and bitmaps in addition to lines drawing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 01:05:28 +00:00
Vadim Zeitlin
2c8c1de1ee Correct wxCOMPILER_PREFIX definition when wxMSVC_VERSION is predefined.
Fix the wrong concatenation macro name that was used as using wxMSVC_VERSION
could not work as expected before (which also shows that nobody ever used it).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-01 01:05:25 +00:00
Vadim Zeitlin
7eb02e44ba Recognize MSVC 11 instead of warning about unknown MSVC version.
Define __VISUALC11__ for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 22:40:24 +00:00
Paul Cornett
78f89f920d remove unnecessary gtk_widget_show(m_widget) calls, PostCreation() takes care of that
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 18:29:31 +00:00
Paul Cornett
85f622694c small includes cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 18:13:06 +00:00
Paul Cornett
0e4046e694 remove unnecessary gtk_widget_show() calls, PostCreation() takes care of that
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 18:05:03 +00:00
Julian Smart
6cabfc592b Always send wxEVT_COMMAND_RICHTEXT_DELETE event if delete or back key pressed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 15:06:49 +00:00
Vadim Zeitlin
dea43e6ee3 Ignore setting empty path in wxGTK wxFileDialog.
wxGenericFileButton calls wxFileDialog::SetPath() with empty path if no
initial path is explicitly specified and this clearly shouldn't do anything --
but it did, as it set the file dialog path to the initial directory (cwd by
default), and so opened it in the parent of that directory which was
completely unexpected and not useful at all.

Simply don't do anything when SetPath("") is called.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 14:45:29 +00:00
Vadim Zeitlin
b54eae5237 Remove redundant assignment in wxDialUpManagerMSW code.
No real changes, just remove a redundant assignment flagged by a static code
analysis tool.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 13:59:01 +00:00
Vadim Zeitlin
59859d3da1 Replace incorrect uses of wxString::empty() with the intended clear().
empty() doesn't empty the string but just checks for its emptiness, clear()
was supposed to be used here instead.

Thanks to PVS-Studio for finding these problems.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 13:58:58 +00:00
Vadim Zeitlin
14aed066ad Initialize m_isShown correctly in wxGenericDragImage::BeginDrag().
The code initialized m_isDirty twice which was clearly wrong. The original
intention was probably to set both m_isDirty and m_isShown to false.

Thanks to PVS-Studio for finding this bug.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 13:58:55 +00:00
Vadim Zeitlin
f90b69e028 Move checks for m_art != NULL before code using m_art in wxAuiToolBar.
It doesn't make sense to check whether a pointer is NULL after using it, so do
the checks first.

In fact the m_art pointer probably can never be NULL at all as other code uses
it without checking and so these checks could probably be removed completely,
but keep them for now as I'm not totally sure if having NULL art provider is
really impossible.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 13:58:52 +00:00
Vadim Zeitlin
b02dd12239 Use /bin/echo for creation of Mac OS X PkgInfo files.
The built-in of /bin/sh doesn't handle "-n" option that we use (at least not
under OS X 10.6), so we were getting "-n APPL????" in the generated files.
Fix this by using /bin/echo which does support this option.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 22:48:39 +00:00
Paul Cornett
d058098eb2 avoid deprecated gdk_net_wm_supports()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 18:23:39 +00:00
Paul Cornett
ab7049776d remove run-time check for now-required GTK 2.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 18:06:22 +00:00
Paul Cornett
f705fbf007 remove unnecessary override of AddChildGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 17:25:59 +00:00
Paul Cornett
cafc6e0f1f fix virtual override broken in r58875
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 17:06:56 +00:00
Stefan Csomor
13842bbf04 removing Quickdraw call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 16:30:58 +00:00
Vadim Zeitlin
4d87e34d03 Fix unused parameter warning in wxOSX build.
No real changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 14:41:30 +00:00
Stefan Csomor
fee9bb6407 making sure TextMatrix is always identity, there were strange artifacts sometimes, maybe due to interference with cocoa text system, adding debug method CheckInvariants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 14:39:32 +00:00
Paul Cornett
b4261b2033 Remove code to query GDK window origin from DoGetPosition(), it should not be necessary, and was probably wrong anyway.
This allows removing unnecessary assertions on m_widget (see #14052).
Also, avoid setting initial position to (-1,-1)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 05:29:35 +00:00
Paul Cornett
c70b2c8f1c avoid crash if IsMaximized() is called before native widget is created, fixes #14052
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 04:40:15 +00:00
Vadim Zeitlin
74bde8745f Fix setting default file name in wxGenericFileDirButton in wxGTK.
Set the default directory first, if it's specified, and the file name later to
ensure that it's interpreted relatively to this directory. Otherwise we could
have a mismatch between the directory shown in the dialog and its initial
path.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 02:05:01 +00:00
Vadim Zeitlin
257d35aead Interpret default file name relatively to initial dir in wxGTK wxFileDialog.
Use the initial dialog directory to build the absolute path required by GTK+
in wxFileDialog instead of the current working directory. This makes more
sense and makes specifying the default directory and (just) the default file
name work correctly and avoids GTK+ warnings like

Gtk-CRITICAL **: gtk_file_folder_unix_get_info: assertion `strcmp (dirname, folder_unix->filename) == 0' failed

(and in some older versions of GTK+ -- 2.10? -- this even results in a crash).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-28 02:04:57 +00:00
Robin Dunn
54c45be005 Add a bit of docs for the FS Handlers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 23:51:05 +00:00
Robin Dunn
f115bfec38 Phoenix needs to see the implementation of pure virtuals so it knows that this class is not abstract.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 23:50:59 +00:00
Robin Dunn
fb3b60978f Add missing RemoveHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 23:50:54 +00:00
Robin Dunn
3507d2d43f Add interface declarations for stock file system handlers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 23:50:49 +00:00
Robin Dunn
c69612defc Change the background style in the template file too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 23:50:39 +00:00
Vadim Zeitlin
b0272c6014 Return an invalid item from wxDataViewCtrl::GetItemByRow() for invalid rows.
This function is called in many places in the code with possibly invalid (i.e.
out of range) row, so handle it gracefully inside it in virtual list control
case. This is consistent with the behaviour in non-virtual case and with that
of GetRowByItem().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 18:54:02 +00:00
Vadim Zeitlin
f2bf2d71c1 No changes, just make wxDataViewMainWindow::GetRowCount() const.
This is clearly an accessor function, so make it const, even if it requires a
const_cast<> inside it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 18:53:58 +00:00
Paul Cornett
a81a195556 remove redundant GTK check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 18:07:21 +00:00
Paul Cornett
fac46b97d6 use 0 (== GTK_STATE_NORMAL) for state parameter default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 17:49:33 +00:00
Paul Cornett
622226dc73 avoid making copy of font description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 16:40:34 +00:00
Stefan Csomor
2432e39563 no 10.4 support anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 15:41:35 +00:00
Stefan Csomor
08eb5b48d0 no 10.4 support anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 15:38:39 +00:00
Stefan Csomor
524248fae3 no 10.4 support anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 15:37:24 +00:00
Stefan Csomor
29c829ba84 no 10.4 support anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 15:35:31 +00:00
Vadim Zeitlin
27674b66c0 Document more events in wxAuiNotebookEvent documentation.
This is the second part of r70691.

Closes #14040.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 15:26:54 +00:00
Stefan Csomor
93b802898d no 10.4 support anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 15:20:19 +00:00
Václav Slavík
eb7df491e1 Improve default wxDVC line height on Windows >= Vista.
Explorer in Vista/Win7 uses slightly larger rows, so mimic it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 14:27:47 +00:00
Vadim Zeitlin
33f270afac Allow passing the list of architectures to --enable-universal_binary.
Interpret --enable-universal_binary argument as a comma-separated list of
architectures to use. By default still use all the supported ones.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 01:47:32 +00:00
Vadim Zeitlin
f04f570fd2 Only include <unistd.h> under Unix in wxGTK code.
Also remove the inclusions of some Unix-specific headers that were not needed
at all.

Closes #14048.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-27 00:40:16 +00:00
Vadim Zeitlin
1b4bff8262 Add minimal support for building non-GUI parts of wxWidgets for Android.
Recognize __ANDROID__ in wx/platform.h and include the appropriate headers
from wx/android.

Also fix a couple of compilation errors (in filename.cpp) and warnings (in
event.h) which only appear when building for Android.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-26 20:24:25 +00:00
Steve Lamerton
1eff60811f Update configure.in to use pkg_config to find the webkit hearers and libraries. Regenerate configure.in
Fixes #14015

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-26 18:36:07 +00:00
Vadim Zeitlin
3b81515cb1 Fix wxGTK compilation when using non X11-based GDK.
Only use X11-specific GDK functions inside "#ifdef GDK_WINDOWING_X11" checks.

Closes #14044.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-26 17:18:41 +00:00
Vadim Zeitlin
8334be51fb Retrieve paper size from page setup dialog in wxOSX/Cocoa.
Call PMGetPageFormatPaper() when retrieving data from the native dialog.

Closes #14047.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-26 17:18:34 +00:00
Julian Smart
880da677a4 Fixed enabling/disabling for wxSpinCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-26 15:44:04 +00:00
Stefan Csomor
968978c0e4 also a dialog needs the current events set up correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-26 13:30:55 +00:00
Stefan Csomor
2712275c88 setting up current event also when mouse is captured ...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-26 10:21:03 +00:00
Vadim Zeitlin
e59e670c9b Ensure that combobox editor used by wxGrid is tall enough.
Set the rectangle of wxGridCellChoiceEditor to be at least as tall as the best
(i.e. minimal) wxComboBox size because otherwise the control can be unusable.

Closes #13818.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 23:49:55 +00:00
Vadim Zeitlin
4dfc0ca0c5 Suppress harmless MSVC warnings about int to bool conversions.
Convert int to bool explicitly to avoid MSVC warning C4800.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 23:49:53 +00:00
Vadim Zeitlin
8b89611217 Document more wxAuiNotebook events.
Add descriptions of several previously undocumented
wxEVT_COMMAND_AUINOTEBOOK_XXX events and the corresponding event table entries.

Closes #14040.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 23:49:49 +00:00
Vadim Zeitlin
4934653e18 Dispatch unknown messages immediately in wxMSW YieldFor().
Failure to do this can have catastrophic consequences, e.g. embedded ActiveX
IE controls may stop working -- even after resuming the normal message
dispatching.

Closes #14027.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 23:49:45 +00:00
Vadim Zeitlin
fe9b56985f Minor fixes to wxMessageBox() documentation.
Correct the default parameters values.

Closes #14043.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 23:49:42 +00:00
Vadim Zeitlin
0f4bf6ac80 Don't assert in wxLocale::IsAvailable() if language is not supported.
We can fail to find language information if we're called with
wxLANGUAGE_DEFAULT and we don't support the current system language.

Closes #14039.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 23:49:39 +00:00
Vadim Zeitlin
7c9b6c9111 Compare file inodes if possible in wxFileName::SameAs().
This allows to correctly return when the two files with different names
actually refer to the same file system object.

Closes #910.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 23:49:35 +00:00
Vadim Zeitlin
41fec01fa9 Remove temporary files created by wxFileName unit test case.
Don't leave temporary files created by wxFileName::CreateTempFileName() lying
around.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 23:49:32 +00:00
Julian Smart
69fa3d26d3 Add borders if none specified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 22:29:25 +00:00
Stefan Csomor
50d4763f17 adding a app-defined event seems to quit inner eventloops like eg the popup of the combobox, therefore use the cf api in this case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 18:30:04 +00:00
Vadim Zeitlin
1995d517d7 Use Doxygen comments for wxVisualAttributes members.
Fix documentation of wxVisualAttributes by simply turning the normal comments
into Doxygen ones.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 15:03:23 +00:00
Vadim Zeitlin
29a3f6548e No changes, just remove functions bodies from interface docs.
Omit the implementations, even trivial ones, from the documentation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 15:03:20 +00:00
Vadim Zeitlin
05fbf0e75e Don't use _T() in the documentation.
This is mainly necessary in order to be able to commit the subsequent changes
to this file as otherwise the commit is refused by the svn post-commit hook
that checks for _T() presence.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 15:03:17 +00:00
Václav Slavík
a739b8b2df Fix r70318 to skip unhandled events.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 12:55:46 +00:00
Julian Smart
2fb1532a89 More reasonable font size for rich text dialogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-25 11:08:11 +00:00
Vadim Zeitlin
53b2d7d70a Dutch translations update from Gideon van Melle.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-23 19:43:05 +00:00
Julian Smart
12f5219fac Added functionality for disabling the vertical scrollbar.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-23 17:01:30 +00:00
Vadim Zeitlin
bf973818a3 Remove duplicate wxFileKind definition from documentation.
Also move wxSeekMode from interface/wx/ffile.h to filefn.h to be consistent
with the header in which this enum is really defined. And document it better.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-23 16:33:13 +00:00
Vadim Zeitlin
36cc76505c Use wxStrnicmp() instead of strncasecmp() in wxGTK code.
This fixes compilation under Windows where strncasecmp() is not available --
but portable wxStrnicmp() always is.

Closes #14036.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-23 13:56:14 +00:00
Vadim Zeitlin
f090e4ef67 No real changes, just fix spelling errors in the documentation.
Closes #14038.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-23 13:56:10 +00:00
Julian Smart
aa8f57f491 Removed unused variable warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-23 07:07:15 +00:00
Julian Smart
abe0903cd4 Compile fixes for wxUSE_COLLPANE=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-22 17:35:21 +00:00
Vadim Zeitlin
96b57f0d2a Mention event type corresponding to EVT_CLOSE in wxFrame documentation.
Closes #14030.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-22 13:41:15 +00:00
Vadim Zeitlin
e3efa5c1ec Don't crash when using wxPrintDialog with NULL parent under GTK.
Check that we have a valid parent before using it.

Also simplify the code a little.

Closes #14033.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-22 13:41:11 +00:00
Vadim Zeitlin
8cddee2d0e Fix spelling in the documentation.
Closes #14034.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-22 13:41:07 +00:00
Stefan Csomor
a2ce64695d catching default button handling also in password fields
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-22 08:24:09 +00:00
Vadim Zeitlin
83189c3b0e Correct wxWinCE port name in @onlyfor in the documentation.
The name used here should be the same as the label used for the corresponding
port in docs/doxygen/mainpages/platdetails.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-21 22:02:21 +00:00
Stefan Csomor
2d0744aa1b making sure eventual borders get updated when windows are shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-21 20:22:16 +00:00
Michael Wetherell
8bda419d02 Remove testing against zip in a pipeline as it no longer supports it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-21 20:11:16 +00:00
Stefan Csomor
91722d7412 making sure eventual borders get updated when windows are hidden
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-21 16:23:39 +00:00
Julian Smart
c8c77ee2af The tree only sets the focus in response to a TVN_SELCHANGINGW event if the tree is not being deleted.
TVN_SELCHANGINGW is generated when the tree items are deleted. Without this change, if a tree control is
in a dialog being closed, the newly active window will become inactive momentarily when tree items
are deleted and you will see a flicker.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-21 09:24:52 +00:00
Robin Dunn
c3e0999b06 Rewrite DoPaint, FullPaint and add FullPaintDC to help deal with flicker problems and to be more like how the other Scintilla ports are working now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-21 05:39:00 +00:00
Robin Dunn
c0e5edf548 If WXWIDGETS is not set and if on cygwin then set it to a DOS style path. (This assumes that it is not a cygwin oxygen that is being run, if that's not the case then set WXWIDGETS before running regen.sh)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-21 05:38:53 +00:00
Vadim Zeitlin
6bed673eb3 Don't crash in wxImage::SaveFile() if MIME type is not recognized.
Insert a missing "return false" whose lack resulted in a crash if the handler
for the given MIME type wasn't found.

Closes #14028.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:57:17 +00:00
Vadim Zeitlin
cb8ae61385 Minor fixes to wxDateTime documentation.
Use @onlyfor{wxmsw} for MSW-specific methods; fix the return type of
operator+=().

Closes #14024.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:57:13 +00:00
Vadim Zeitlin
488b8b52bb No changes, just simplify some code in wxX11.
Don't use redundantly weird flags tests.

Closes #14020.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:57:10 +00:00
Vadim Zeitlin
cec9cd06a3 No changes, just remove a redundant wxGROW.
Closes #14018.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:57:06 +00:00
Vadim Zeitlin
a0bf1b587f Remove documentation of inexistent wxEvtHandler::TryThis().
This method existed only briefly and was replaced by Try{Before,After}().

Closes #14012.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:59 +00:00
Vadim Zeitlin
af46dd7bb8 Allow handling EVT_UPDATE_UI for wxID_UNDO/REDO at wxDocument level.
Don't require using wxCommandProcessor for this, only use it if it exists.

Closes #14011.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:55 +00:00
Vadim Zeitlin
1e26459c5e Document wxNotificationMessage::Timeout_XXX values.
Closes #14009.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:52 +00:00
Vadim Zeitlin
c9069ea343 Fix typos in wxRibbonButtonBar documentation.
Closes #14008.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:46 +00:00
Vadim Zeitlin
5c54f4e9c8 Minor documentation fixes to wxHelpController.
Fix the methods signatures to match the real ones.

Closes #14007.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:42 +00:00
Vadim Zeitlin
1f165e7432 Add skeleton documentation for wxMessageDialog::ButtonLabel.
This class shouldn't be really used directly but document it just to make the
interface header valid C++ as this class was used as parameter type but never
defined.

Closes #14006.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:38 +00:00
Vadim Zeitlin
0eb1fbf01b Fix wxRichTextBuffer::InsertParagraphsWithUndo() documentation.
Use the same parameters order as in the real header file.

Closes #14005.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:34 +00:00
Vadim Zeitlin
184abb52a8 Add @onlyfor tag to wxToolBar::SetBitmapResource() documentation.
Closes #14004.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:30 +00:00
Vadim Zeitlin
52cd518033 Add @onlyfor tags for Unix-specific wxStandardPaths methods.
Closes #14003.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:25 +00:00
Vadim Zeitlin
f85d2074fb Add @onlyfor tag for wxSound::IsPlaying() documentation.
This is not totally precise as the method is available in all Unix-based ports
but currently there doesn't seem to be any way to specify this so just mention
its availability in wxGTK which is what counts.

Closes #14002.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:22 +00:00
Vadim Zeitlin
805b7b2109 Make wxSingleChoiceDialog::GetSelectionData() const.
Also restore const-ness of GetSelectionClientData() lost in r70514.

Closes #14001.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:18 +00:00
Vadim Zeitlin
267c55c377 Fix wrong spelling of wxRegKey::HasSubkeys() in the documentation.
This method is currently called HasSubkeys() and not HasSubKeys() even though
the latter would have been more consistent with HasSubKey() so we might
consider renaming it in the future. But for now just fix the documentation.

Closes #13998.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:14 +00:00
Vadim Zeitlin
fa60451416 Remove inexistent wxPropertySheetDialog::SetInnerSizer() from documentation.
Closes #13997.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:10 +00:00
Vadim Zeitlin
67414f005d Synchronize wxPropertyGridManager documentation with the real API.
Fix GetSelection() return type; remove SetStringSelection() which doesn't seem
to exist any more; other minor fixes.

Closes #13996.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:06 +00:00
Vadim Zeitlin
5aabd64cf2 Synchronize wxPropertyGrid documentation with the real API.
Document DoRegisterEditorClass() (even though it's not really clear whether it
should be documented); remove the inexistent SetButtonShortcut() documentation
and other minor fixes.

Closes #13995.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:56:03 +00:00
Vadim Zeitlin
f030ce0cff Don't initialize wxFileDialog::m_filterIndex to 1 in wxMotif.
This makes it consistent with all the other ports.

Closes #1129.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:55:59 +00:00
Vadim Zeitlin
7193abfbc8 Use wxPageSetupDialogData instead of old wxPageSetupData everywhere.
No real changes, just don't use the old and kept for compatibility only
wxPageSetupData name.

Closes #13992.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:55:55 +00:00
Vadim Zeitlin
96dc06fdce Remove wxDialog::OnSysColourChanged() documentation.
This event handler is a private implementation detail and shouldn't be
documented.

Closes #13964.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 21:55:49 +00:00
Julian Smart
7e2cf46425 Removed unnecessary newlines.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 18:02:04 +00:00
Julian Smart
6460c5990b Minor fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 17:58:39 +00:00
Julian Smart
55e72ca5c4 Corrected missing angled bracket
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 17:57:56 +00:00
Julian Smart
c9f18835ab Added wxEVT_WIZARD_BEFORE_PAGE_CHANGED event to allow the application to influence
the return value of GetNext after Next is clicked.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 11:38:52 +00:00
Vadim Zeitlin
9362d82351 Fix unit test French locate checks for glibc >= 2.8.
Until 2.7 glibc wrongly used periods instead of slashes as separators for the
French date format and the test accounted for this, breaking it with recent
glibc versions in which this bug was fixed.

Fix this by limiting the workaround to the old glibc versions only.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 10:59:37 +00:00
Vadim Zeitlin
eeea7e8cf0 Don't apply svn commit hook checks to 2.8 branch.
Some of the files in 2.8 still use the old conventions, allow doing changes in
them without completely updating them to follow the rules checked by the hook.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-19 15:50:32 +00:00
Vadim Zeitlin
a4a07f1a43 Don't exclude message catalog files from UTF-8 checks in svn hook.
The message catalogs do use UTF-8 now, so check that no non-UTF-8 ones are
checked in in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-19 15:50:29 +00:00
Stefan Neis
e75e881575 Spelling fixed for comments and a wxASSERT_MSG. Fixes #14022.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-19 14:49:37 +00:00
Stefan Neis
c44db939d6 Fixed spelling errors, fixes #14021.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-18 19:59:59 +00:00
Stefan Neis
e91d8a28e8 Spelling fixes to comments, fixes #13994.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-18 19:43:03 +00:00
Stefan Neis
3534fee076 Fixed miss-spelling in output messages (enviroment -> environment,
occured -> occurred), fixing 13993.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-18 19:31:59 +00:00
Vadim Zeitlin
be546c6fe4 Update the main translation template and all the message catalogs.
This was done mostly to ensure that updating works correctly after the last
round of manually fixing the catalogs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-18 17:12:56 +00:00
Vadim Zeitlin
2ff4ddf830 Remove duplicate "About" entries from message catalogs.
Somehow we had duplicate entries for "About" string in almost all the message
catalogs. This prevented them from compiling correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-18 17:12:41 +00:00
Julian Smart
81702b39d3 Removed OnSelect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-18 14:24:38 +00:00
Julian Smart
51795e3399 Fixed name of GetCombinedStyleForLevel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-18 14:22:56 +00:00
Julian Smart
d2ae3af890 Applied #14000 (wxRichTextXMLHandler interface fixes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-18 14:20:01 +00:00
Paul Cornett
93a555caff modification to fix in r70597, has-window check is unnecessary and perhaps incorrect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 16:41:23 +00:00
Vadim Zeitlin
c34ced947a Add forward declarations to fix wx/propgrid/editors.h compilation.
This header resulted in compilation errors if it was included as the first
propgrid header. Fix this by adding the required forward declarations.

Closes #13989.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:40:22 +00:00
Vadim Zeitlin
c66a675a5e Remove wrong "const" from wxPosition::operator{+,-}=() documentation.
Closes #13991.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:40:18 +00:00
Vadim Zeitlin
ee094b632d Fix the name of wxPersistentTreeBookCtrl in the documentation.
It was misspelt as wxPersistentTreeBook.

Closes #13990.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:40:14 +00:00
Vadim Zeitlin
9e610e1caf Remove non-existent wxPGChoices methods from the documentation.
wxPGProperty::Add(wxArrayString, ValArrItem), GetItemAtY() and HasValue() were
documented but don't actually exist, remove them.

Also correct wxPGProperty::Empty() scope: it's protected and not public.

Closes #13988.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:40:10 +00:00
Vadim Zeitlin
6dea83846b Fix typo in wxOwnerDrawnComboBox ctor documentation.
"[]" was in the wrong place.

Closes #13987.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:40:07 +00:00
Vadim Zeitlin
c68b896746 Fix typo in wxMultiChoiceDialog::GetSelections() name in the documentation.
Closes #13986.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:40:04 +00:00
Vadim Zeitlin
9b026e3159 Mark Mac-specific wxMenuBar methods with @onlyfor{wxosx}.
Closes #13985.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:40:00 +00:00
Vadim Zeitlin
0364ac987d Document the default size of new wxMemoryBuffer correctly.
Documenting it as DefBufSize wasn't really helpful, so just use its value
instead (an alternative would be to document DefBufSize -- with its value --
but it doesn't seem very useful to make it part of the public API).

Closes #13984.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:39:56 +00:00
Vadim Zeitlin
16205a28d2 Fix wxMediaCtrl::GetPlaybackRate() method name in the documentation.
Closes #13983.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:39:53 +00:00
Vadim Zeitlin
0c2bed825d Document wxConvFileName variable, not wxMBConvFile class.
The class doesn't exist (and the documentation even says that much) but the
global variable does exist, so document it instead.

Closes #13982.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:39:49 +00:00
Vadim Zeitlin
996d3fe3f8 Added wxFileName::Exists().
This function checks for existence of anything with the given name, not
necessarily just a file or a directory.

Extend the unit test to verify that it returns true for /dev/null on Unix
systems.

Closes #953.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:39:46 +00:00
Vadim Zeitlin
901504c383 Refactor wxFileName existence checking code.
Merge FileExists() and DirExists() together in a single
wxFileSystemObjectExists() helper in preparation for adding a function
checking for the existence of any kind of file system object.

There should be no changes for MSW/Unix but OS/2 file detection was changed
slightly to always use DosQueryPathInfo() instead of using it only for the
directories and stat() for files. Not sure if this is the right thing to do
there but it seems like the code should work.

Also add a simple unit test for these functions.

See #953.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:39:41 +00:00
Vadim Zeitlin
06bfd04527 Explicitly document that hidden windows get wxEVT_IDLE events.
This wasn't always the case and could be unexpected so document this behaviour
clearly, also explain the rationale for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 15:39:37 +00:00
Paul Cornett
5807245682 avoid sending mouse events to the wrong window, fixes #2917
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 07:04:42 +00:00
Vadim Zeitlin
21371c1df0 Document wxLogGui::DoShow{Single,Multiple}LogMessage() as private.
These methods should be documented because they can be overridden but they're
private so document them as such.

Closes #13981.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:36:02 +00:00
Vadim Zeitlin
b5176f6d75 Don't document wxListCtrl::SetColumnsOrder() as being const.
Because it isn't.

Closes #13980.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:58 +00:00
Vadim Zeitlin
659334e17f Clean up wxListBox documentation.
Remove the methods inherited from the base class, there is no need to
re-document them here, especially as this was done incorrectly for Set().

Do document EnsureVisible() and IsSorted().

Closes #13979.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:55 +00:00
Vadim Zeitlin
cda337fbb0 Make documentation of wxIcon::ConvertToDisabled() more explicit.
Use @onlyfor{wxmsw} and explain how can the same task be done under the other
platforms.

Closes #13977.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:52 +00:00
Vadim Zeitlin
0e1cd9bedb Document wxFTP::TransferMode enum in the correct scope.
It's declared inside wxFTP class and not in global scope.

Closes #13976.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:47 +00:00
Vadim Zeitlin
fc910c50d9 Document wxGB{Position,Size}::operator!=(), remove operator!().
The latter doesn't exist (any more?), the former does.

Closes #13975.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:43 +00:00
Vadim Zeitlin
8d2f4cb986 Remove documentation of non-existent wxFontMapper::SetConfig().
Closes #13974.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:39 +00:00
Vadim Zeitlin
ccca2121ef Document Mac-only wxFileName methods as being Mac-only.
Use @onlyfor for them for consistency and to help the automated code
generators.

Closes #13971.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:36 +00:00
Vadim Zeitlin
0b64c2ad63 Document wxFileType::MessageParameters class.
Documentation is not really very helpful but better than nothing.

Closes #13972.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:32 +00:00
Vadim Zeitlin
b3a3a879c3 Fix wrong type of wild card parameter in wxFileCtrl documentation.
It is a string, not a point.

Closes #13970.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:29 +00:00
Vadim Zeitlin
82b30473f9 Make wxDragImage ctors taking hot spot point really deprecated in wxMSW.
They were documented as deprecated and deprecated in the generic version (and
actually not even available there any more without WXWIN_COMPATIBILITY_2_6)
but not in wxMSW, where we just had the weird wxLogDebug() statements that
were inconsistent with our handling of deprecation everywhere else.

Do deprecate them now, remove wxLogDebug() and also remove the deprecated
ctors and Create() overloads from the documentation.

Finally, remove the documentation of deprecated and available in the generic
version only ctor taking only wxCursor (closes #13967).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:25 +00:00
Vadim Zeitlin
c3a0b0d876 Document wxDocManager::CreatePreviewFrame() as being protected, not public.
Simply move the function documentation to the correct class section.

Closes #13966.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:21 +00:00
Vadim Zeitlin
02f5e7631d Don't document private event handlers in doc/view frame classes.
wxDoc[MDI]ParentFrame::OnCloseWindow(), wxDoc[MDI]ChildFrame::OnActivate() and
OnCloseWindow() are all private, don't document them as public. Just mention
that the wxEVT_CLOSE_WINDOW and wxEVT_ACTIVATE should be left for the
processing in the frame classes to let the default handling take place.

Closes #13965.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-15 00:35:18 +00:00
Vadim Zeitlin
df1f2558e1 Mention __WIN64__ in the preprocessor defines documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-14 23:14:53 +00:00
Vadim Zeitlin
ec8823e77a Remove the mention of non-existing wxPrintf_l() from the documentation.
This function doesn't exist (yet), so don't advise people to use it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-14 23:09:33 +00:00
Stefan Csomor
85a17748bd adding missing initializer to raw_control, fixes #13963
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-13 15:23:33 +00:00
Stefan Csomor
df856ba90a adapting comparison to raw_control, see #13963
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-13 15:22:04 +00:00
Vadim Zeitlin
9c1fed55d7 Don't document deprecated wxComboCtrl::SetValueWithEvent().
This method shouldn't be used at all, either SetValue() or ChangeValue()
should be used instead, so don't document it.

Closes #13961.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-12 22:19:07 +00:00
Vadim Zeitlin
4bdc891f54 Implement wxDV_ROW_LINES for generic wxDataViewCtrl.
Provide wxDataViewCtrl::SetAlternateRowColour() to specify the colour to use
for odd rows explicitly but determine it automatically from the background
colour if no explicit colour was specified.

Closes #12834.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-12 22:19:04 +00:00
Vadim Zeitlin
8b6af8eedd Don't use deprecated wxDataViewCtrl::StartEditor() in the sample.
Also document this deprecation in the change log and explain how to update the
existing code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-12 22:18:59 +00:00
Robin Dunn
aef060ab6c remove some wxPython-only methods that were accidentally added to the interface file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-11 20:32:32 +00:00
Paul Cornett
ac900e6ba5 remove wxGraphicsContext dependency for transparent background support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-11 19:39:23 +00:00
Vadim Zeitlin
400930d344 Document wxDateTime::GregorianAdoption enum and TimeZone class.
These types are referenced by the other documented functions so should be
documented themselves.

Closes #13959.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-11 18:36:44 +00:00
Vadim Zeitlin
6f65f436e5 Fix "wxEmptyStr" typo in wxChoicebook and wxToolbook documentation.
It should be "wxEmptyString".

Closes #13955.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-11 18:36:41 +00:00
Vadim Zeitlin
1442168125 Implement wxBG_STYLE_TRANSPARENT support for wxGTK.
Use composited windows if supported by GTK+ for wxWindows with this background
style.

Also add wxWindow::IsTransparentBackgroundSupported() and show how to use it
in the sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-11 16:26:52 +00:00
Vadim Zeitlin
c3d3028a44 Update marks in non-current months shown in wxMSW wxCalendarCtrl.
Native wxMSW calendar control can show more than just the current month. When
other months are shown, ensure that they don't have marks for the days marked
in the current month as this doesn't make sense.

See #13934.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-11 16:26:47 +00:00
Vadim Zeitlin
169b83dd23 Set marks used in wxMSW wxCalendarCtrl unconditionally.
This fixes wrong display (random days could have been shown marked) when not
using wxCAL_SHOW_HOLIDAYS style. Apparently we need to set the marks
unconditionally as they are not turned off by default, so ensure we call
UpdateMarks() even without wxCAL_SHOW_HOLIDAYS.

See #13934.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-11 16:26:41 +00:00
Vadim Zeitlin
e9270aaac8 Also add wxNativeFontInfo::SetStrikethrough() stub for wxGTK2.
This should have been done in r70563 which added the stub to wxGTK1 part only.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-11 16:26:39 +00:00
Vadim Zeitlin
289fc83385 Added a test for wxUSE_DATAOBJ to wxDFB which doesn't support it.
This is just one of many, many things not supported by wxDFB but check for at
least this one as it prevents even the precompiled header from being created.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-10 23:34:49 +00:00
Vadim Zeitlin
077c263a4c Fix compilation ofr ports without native font info, such as wxDFB.
Don't use wxString::ToLong() with short variable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-10 23:34:45 +00:00
Vadim Zeitlin
ed7f03bbf3 Add stubs for wxNativeFontInfo::{Get,Set}Strikethrough() to wxGTK.
These functions are not implemented currently (just as their
{Get,Set}Underlined() counterparts) but should still be defined to allow the
code using wxNativeFontInfo to link.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-10 23:34:42 +00:00
Robin Dunn
9425a21c33 Don't include the terminating NUL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-10 18:30:13 +00:00
Vadim Zeitlin
8d9eee8320 Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.
Fully qualify the hasher and comparator classes used with
WX_DECLARE_HASH_{SET,MAP} macros as they're used as base classes by the
standard library implementation in g++ 4.7 and using them without the scope
operator results in compilation errors because they're interpreted as being
(inaccessible) base classes and not the global ones.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-10 10:22:45 +00:00
Vadim Zeitlin
37fff49cf1 Document MSW-only wxEVT_MOVING event.
As we documented EVT_MOVE_{START,END}, we should do it for this one as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-09 16:22:04 +00:00
Vadim Zeitlin
7d001b19ef Fix typo in wxSlider XRC format documentation.
"pagesize" was documented as line size, fix this.

Closes #13949.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-09 13:24:43 +00:00
Vadim Zeitlin
ab6a33b4ad Fix wrong signature of wxBitmap(bits) ctor in the documentation.
This ctor takes just a "char* bits" (spelt as "char bits[]" for some reason),
not "char* bits[]".

Closes #13947.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-08 23:45:32 +00:00
Vadim Zeitlin
419b20032b Restrict button size restrictions documentation to OSX/Carbon only.
OSX/Cocoa doesn't have these restrictions.

Closes #13122.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-08 12:59:20 +00:00
Vadim Zeitlin
f9afe2fece Document that wxStandardPaths::GetUserConfigDir() doesn't use app info.
Explicitly mention this instead of just relying on the examples to convey it.

Closes #11275.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-08 02:09:58 +00:00
Vadim Zeitlin
f549e3dad9 Use wxSTC_INVALID_POSITION in wxStyledTextCtrl documentation.
Comments -- copied from the generated header file -- used INVALID_POSITION
which is not actually defined, replace it with wxSTC_INVALID_POSITION that is
defined.

Closes #11454.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-08 02:09:55 +00:00
Vadim Zeitlin
73b1a25db7 Document wxAUI_NB_MIDDLE_CLICK_CLOSE.
Also mention that it's part of wxAUI_NB_DEFAULT_STYLE.

Closes #13382.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-08 02:09:51 +00:00
Robin Dunn
6fc5325167 Interface fixes changing fiction into truth.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-08 00:22:21 +00:00
Robin Dunn
4e17cf82ff Following the theory that something lame is better than nothing at all, provide a very generic implementation of the ctor wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle) by drawing the polygon into a bitmap and using that to create the region.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-08 00:20:38 +00:00
Robin Dunn
eb74c22a0b Add an empty implementation of the OSXGenerateEvent() pure virtual so the generic date picker ctrl can be used in the cocoa build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-08 00:16:59 +00:00
Robin Dunn
1ffe914a26 Don't assume that XCode is in /Developer. Use "xcode-select -print-path" instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 23:57:00 +00:00
Robin Dunn
017ddee0cb use buf.length() instead of strlen()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 23:55:50 +00:00
Robin Dunn
6f67e6d2e4 Add length parameter to AddTextRaw and AppendTextRaw. Closes #1358
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 23:55:07 +00:00
Vadim Zeitlin
49a63afbad Avoid CRT deprecation warnings for MSVC build using makefiles too.
Define _CRT_SECURE_NO_DEPRECATE, _CRT_NON_CONFORMING_SWPRINTFS and
_SCL_SECURE_NO_WARNINGS when using makefiles to build the library too for
consistency with the project files.

These defines are only needed for VC8 and later but should do no harm for the
previous versions.

See #11009.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 21:38:31 +00:00
Vadim Zeitlin
ba7512e14d Rebake all project files to reflect MSVC deprecation warnings defines.
Rebake all the projects after the changes of r70182, even if they're only
really needed for the library itself, the other project files should
correspond to the bakefiles contents too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 21:38:09 +00:00
Stefan Csomor
a7ba5d1efb forwarding mouse moved events to the view under the mouse, not the firstResponder
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 16:40:40 +00:00
Vadim Zeitlin
9d38429920 Fix wxAboutDialogInfo::GetName() return type in the documentation.
wxString is returned by value, not const reference.

Closes #13941.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 13:48:44 +00:00
Vadim Zeitlin
846f4568e5 Fix infinite loop in wxHtmlEasyPrinting page break code.
The code didn't handle cells higher than the page height correctly and entered
an infinite loop when trying to adjust page breaks in their presence, e.g.
when trying to print a very tall image.

Closes #13935.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 13:02:32 +00:00
Vadim Zeitlin
d7235613f4 No real changes, just pass const wxArrayInt to wxHtmlCell::AdjustPagebreak().
AdjustPagebreak() never modifies the array passed to it, so pass it as const
reference.

See #13935.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 13:02:27 +00:00
Jouk Jansen
67a99b7c79 Update setup for OpenVMS to make wxX11 work again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-07 10:33:31 +00:00
Vadim Zeitlin
b98eb28a50 Return NULL from wxAuiNotebook::GetCurrentPage() if there is no selection.
Make it behave as wxBookCtrlBase::GetCurrentPage() and just silently return
NULL instead of asserting if there is no selection.

Closes #13932.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-06 13:28:42 +00:00
Vadim Zeitlin
38d7fa2525 Fix typo in an event type constant in wxTreeListCtrl documentation.
s/CHeCKED/CHECKED/g

Closes #13931.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-06 13:28:39 +00:00
Vadim Zeitlin
75717cb121 Fix handling of positional parameters in wxPrintf() and related.
Handle positional parameter specifications in wxFormatConverter to ensure that
e.g. "%N$s" are correctly transformed to "%N$S" if needed. This fixes the use
of positional parameters under OS X.

Closes #10965.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-06 13:28:34 +00:00
Stefan Neis
a8ed16c999 Reverted bogus fix for bogus bug report #13402.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 22:53:39 +00:00
Stefan Neis
6dadeb495b Mark unused parameter as such, fixes #13402.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 22:20:57 +00:00
Paul Cornett
3b7c7652d7 remove code ifdef-ed on __X__, it is never defined for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 17:43:28 +00:00
Vadim Zeitlin
fd76344ecc Don't set PAGESETUPDLG::hDevNames and hDevMode when using PSD_RETURNDEFAULT.
If the page setup dialog is used to retrieve the default information, hDevMode
and hDevNames fields must not be set, otherwise PageSetupDlg() function simply
fails because of incorrect parameters passed to it.

Closes #13928.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 15:45:03 +00:00
Vadim Zeitlin
0e3b10c509 Fix huge performance problem in wxStdInputStream when using MSVC8/9.
Our overridden xsgetn() method was never called when using these compilers
because they used their own, non-standard, _Xsgetn_s() instead. Because of
this the stream was always read character by character which was very
inefficient.

Fix the problem by overriding _Xsgetn_s() for these compilers and explicitly
forwarding it to xsgetn().

Closes #13926.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 14:18:37 +00:00
Vadim Zeitlin
fc12b1f12a Take void** client data in wxSingleChoiceDialog ctor and not char**.
The client data is supposed to be untyped, there is really no reason (other
than compatibility with C conventions of 40 years ago) to use char** here.
So don't do it and provide the versions taking "void**" keeping "char**" ones
for backwards compatibility only.

Also deprecate GetSelectionClientData() that returned char* and add a new
GetSelectionData() returning void* instead.

Closes #13876.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 14:18:33 +00:00
Vadim Zeitlin
0c6dff0370 Preserve focus when window is minimized and restored in wxMSW.
Add specific code to save and restore the focus when the window is minimized
and restored in wxMSW as the existing code in WM_ACTIVATE handler wasn't
enough because this event was generated too late when minimizing the window
(when it was already minimized and so the focus had been already lost) and too
early when restoring it (so the window was still minimized and restoring focus
failed).

This is still not perfect as we do in our code something Windows would be
expected to do automatically but for whatever reason, it doesn't do it for
wxWidgets programs, and this manual workaround at least prevents the annoying
total focus loss.

Closes #1599.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 14:18:28 +00:00
Vadim Zeitlin
7e08367534 Ensure that the progress dialog parent is activated at the end under MSW.
The progress dialog parent was supposed to become the new foreground window
when the progress dialog was closed, but this didn't happen because
m_parentTop was never set when the native progress dialog implementation was
used under MSW. Fix this by explicitly calling the new SetTopParent() from its
ctor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 14:18:25 +00:00
Vadim Zeitlin
7cee4f7621 No changes, just implement Raise() in wxTopLevelWindow in wxMSW.
Get rid of two identical implementations in wxFrame and wxDialog and only
override this function once in wxTopLevelWindow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 14:18:22 +00:00
Vadim Zeitlin
d4a762e30a Fix initial state of radio toolbar tools in wxGTK.
The last radio group item was initially checked under wxGTK instead of the
first one, as under the other platforms. Fix this by correcting the check for
the first radio group item which was inversed in wxToolBar::DoInsertTool().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 01:20:03 +00:00
Vadim Zeitlin
de75a255e5 Never refresh controls from EVT_PAINT handler in wxPropertyGrid.
Refreshing the controls after finishing repainting the grid results in an
infinite stream of paint events, so don't do this, especially as this doesn't
seem to have any bad consequences under wxGTK which was the only major
platform where this behaviour was enabled.

Also rename wxPG_REFRESH_CONTROLS_AFTER_REPAINT to just wxPG_REFRESH_CONTROLS
and keep the control refreshing code for wxGTK only in a couple of places
outside of EVT_PAINT handler to be on the safe side.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 01:20:00 +00:00
Vadim Zeitlin
fe8aae41ab Fix the URL generated by Doxygen @sampledir macro.
"samples/" part of the URL was missing, add it.

Closes #13925.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-04 12:22:46 +00:00
Vadim Zeitlin
06a5213db0 Document wxNO_3D as being obsolete.
This style doesn't do anything any more, so replace it documentation with a
deprecation notice.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-04 11:45:53 +00:00
Vadim Zeitlin
c1d6046e39 Fix typo in EVT_TREE_END_LABEL_EDIT documentation.
Wrong event type was used, correct it.

Closes #13922.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-03 17:57:59 +00:00
Vadim Zeitlin
9b42a9adc2 Check string length correctly in wxFileSystem::URLToFileName().
Check that the string is long enough before accessing its first and second
characters to fix a crash when an empty or one-character string was passed to
wxFileSystem::URLToFileName().

Closes #13920.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-03 17:27:21 +00:00
Vadim Zeitlin
1dcca9b51e Enable callbacks for wxFileSystemWatcher FD under OS X.
We need to enable callbacks to get them initially, otherwise no events are
ever detected.

Closes #13919.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-03 17:27:17 +00:00
Vadim Zeitlin
406a0ab32c Fix speed regression in wxFileHistory::AddFileToHistory().
Avoid full normalization including wxPATH_NORM_LONG when adding files to
wxFileHistory as this can take a very long time when using network paths under
Windows.

Closes #13915.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-03 17:27:13 +00:00
Vadim Zeitlin
9d05b85deb Turkish translations update from Kaya Zeren.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-03 14:15:17 +00:00
Vadim Zeitlin
e2e19a29ac Fix the type of global font constants in the documentation.
wxNORMAL_FONT, wxSMALL_FONT &c were documented as wxFont objects but they are
really wxFont pointers.

Closes #13917.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-03 00:24:09 +00:00
Vadim Zeitlin
7bd2132891 Fix bug with mouse wheel scrolling wxStyledTextCtrl in long running programs.
In long running programs the wxEvent time stamp could wrap around resulting in
all mouse wheel events being ignored in wxStyledTextCtrl as the comparison of
the (positive) time until which all the subsequent events were supposed to be
blocked and the (now negative) current event time stamp would be always false.

Fix this by using wxStopWatch::TimeInMicro() to avoid wraparound instead of
wxEvent::GetTimestamp().

Also rename the variable to have a more clear name as the original code wasn't
easy to understand.

Closes #9057.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-03 00:21:45 +00:00
Steve Lamerton
9447a0d6af Disable navigation sounds in wxWebViewIE. This brings the backend into line with the other backends. Also add a general method for changing INTERNETFEATURELIST settings.
See #13694

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-02 20:32:08 +00:00
Vadim Zeitlin
d9c4ffa893 Fix initial wxRadioBox buttons positions in wxMSW.
We only updated the button positions when the radio box was moved or resized
after being created but didn't do it initially, so a radio box created with
fixed position and size didn't lay out its buttons correctly. Do lay them out
immediately after creating the radio box to fix this.

Closes #13912.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-02 14:26:06 +00:00
Vadim Zeitlin
d05ff890b4 Add wxFontDialog ctor not taking wxFontData to wxOSX.
wxFontDialog should have ctor and Create() overload taking just wxWindow
parent in addition to the one taking parent and wxFontData used to initialize
the dialog but it didn't have them in wxOSX, do add them now.

Closes #13908.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-02 14:19:34 +00:00
Vadim Zeitlin
7f15deea6d Fix wxDataViewCtrl::GetItemRect() signature in wxOSX and document it better.
The second parameter of this method should be optional, so make it so in wxOSX.

Also document what this method does exactly and the platforms under which it's
implemented.

Closes #13914.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-02 14:19:30 +00:00
Stefan Csomor
f897d9ed1a should not bring to front upon focussing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-01 13:25:35 +00:00
Vadim Zeitlin
a8228fd18c Remove duplicate wxPoint2DInt operator declarations.
No real changes, just remove the redundant declarations.

Closes #13900.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 19:39:43 +00:00
Vadim Zeitlin
d8b130867c Set the file name for temporary wxFFile objects.
Pass the name of the temporary file to wxFFile::Attach(). This allows to give
more useful error messages if any operation on this file fails later.

Closes #13903.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 19:38:45 +00:00
Vadim Zeitlin
6ea6639cdf Document wxFFile::GetName().
Somehow this method was not documented.

See #13903.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 19:38:41 +00:00
Paul Cornett
b9ced7a914 remove virtual override that just calls base
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 17:44:32 +00:00
Paul Cornett
5105db37ab implement wxGetMousePosition without using X-specific code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 17:41:21 +00:00
Stefan Csomor
7dc941e3c5 guarding Update() on OSX not to be issued faster than 1/30 later than the last redraw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 17:39:39 +00:00
Stefan Csomor
8c7fb50829 revert to using Update()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 17:37:31 +00:00
Stefan Csomor
a27c36f965 reenabling an Update where necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 15:00:03 +00:00
Vadim Zeitlin
c84ef5b9f7 Fix wxHTTP::SetPostBuffer() compilation in ANSI build.
wxString::mb_str() returns a raw pointer and not wxScopedCharBuffer when
wxUSE_UNICODE==0 so fix the code to do it differently in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 13:09:11 +00:00
Vadim Zeitlin
5606890945 Don't document wxVector<>::reverse_iterator.
Documenting just this class but not iterator (and const_iterator) is
inconsistent but documenting all of them is too much mostly useless work as
all iterators (of the same category) have the same interface anyhow. So just
remove the documentation of reverse_iterator for now.

See #2585.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 13:09:07 +00:00
Vadim Zeitlin
a8953e155b Remove dummy Lithuanian translations.
All non-translated strings were "translated" as their English originals in
lt.po. This was just a artefact of the software used for translation and
wrong, so remove all these dummy translations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 13:09:04 +00:00
Paul Cornett
030f4112fc handle theme change which changes window border width
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-31 07:30:11 +00:00
Stefan Csomor
10effff832 attempt to isolate which Update() calls are necessary at all, as they cause performance issues under OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-30 16:30:59 +00:00
Stefan Csomor
4815db04e0 always setting the event object to the menu, see #1595
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-30 16:25:22 +00:00
Stefan Csomor
39cfb4b2ad fixing the routing of UpdateUI to the window by just passing NULL as source
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-30 16:05:03 +00:00
Paul Cornett
27c38af613 move SetPangoAttrsForFont to wxFont, should have been part of r70475
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-29 08:49:01 +00:00
Paul Cornett
304c3065c7 use GTKSetPangoAttrs in wxCairoContext
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-29 08:35:45 +00:00
Paul Cornett
99f8cf22db move Pango underline workaround into wxFont::GTKSetPangoAttrs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-29 08:14:34 +00:00
Paul Cornett
c7e99122a0 move SetPangoAttrsForFont to wxFont
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-29 08:00:15 +00:00
Stefan Csomor
48d43515c2 use translatable strings as format template for menu lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-28 13:37:04 +00:00
Stefan Csomor
1c415bab65 adding OSX to the platforms which do the ui update upon menu open
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-28 13:31:16 +00:00
Julian Smart
cc2aecdef5 Added further API for intercepting deletion and content insertion
Added simple implementation of locked objects to sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 15:10:09 +00:00
Stefan Csomor
eccdb55165 structure code to Cocoa's possibilities, allows tool windows with just a caption and no buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 10:33:26 +00:00
Bryan Petty
8724973ada Added more conveniently placed 'List of All Members' link on all class doc pages in the header summary (using JS).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 06:39:53 +00:00
Vadim Zeitlin
2ba61518f4 Fix return value of wxMBConvUTF8::FromWChar().
Apply the same fix as was done in r68694 for ToWChar() to FromWChar(): it also
returned an off by 1 value when not using MAP_INVALID_UTF8_NOT.

Closes #13400.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 00:10:44 +00:00
Vadim Zeitlin
8c85eb7b47 Update wxCommandProcessor after saving wxDocument.
Surprisingly, wxCommandProcessor::MarkAsSaved() method was never called by
wxDocument so saving the document didn't update wxCommandProcessor dirty
status.

Do add a call to MarkAsSaved() now, this allows wxCommandProcessor to track
its status correctly (and actually more correctly than the dirty status of the
document which becomes "dirty" after doing and undoing an operation after
saving it, unlike wxCommandProcessor::IsDirty() which correctly returns false
in this case).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 00:05:15 +00:00
Vadim Zeitlin
812a21486d Fix wxCommandProcessor::IsDirty() result after undoing everything after save.
IsDirty() returned false when all commands were undone after saving even
though it clearly should have returned true in this case.

Fix this and add comments explaining what happens in this method.

Closes #2862.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 00:05:12 +00:00
Vadim Zeitlin
ef20428e99 Don't compare invalid iterators in wxCommandProcessor::IsDirty().
Check that m_lastSavedCommand is valid before comparing it with
m_currentCommand as comparing invalid iterators results in an assert in STL
build (and probably should also result in an assert in non-STL build too for
consistency).

Also move IsDirty() implementation out of line to make it easier to modify it
further in the future and because there is no real reason to keep it inline.

Closes #13465.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 00:05:09 +00:00
Vadim Zeitlin
58d77880bb Forward declare wxFont in wx/gtk/private.h.
This fixes compilation in STL build (for some strange reason it doesn't affect
the default build however).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 00:05:06 +00:00
Vadim Zeitlin
7e98c451df Minor fixes to wxDataViewCtrl::HitTest() in wxGTK.
Initialize the return parameters with invalid values and use const_cast<>.

See #12582.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 00:05:03 +00:00
Vadim Zeitlin
d4473a9b58 Set the initial size of the expanded ribbon panel correctly.
We need to set the client size of the frame showing the panel to the panel
size and not the full frame size.

Closes #13850.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 00:04:59 +00:00
Vadim Zeitlin
d928f01967 Fix setting frame icon when using non-standard icon sizes in wxMSW.
Set the closest (and larger, if possible) icon if the icon of exactly the
system icon size is not available. This fixes setting the icons when using
custom DPI settings under MSW as the standard icon size may be different from
the standard 32*32 in this case.

This also improves wxIconBundle::GetIcon() to make its behaviour when the icon
with exactly the given size is not found more flexible as a side effect.

Closes #13891.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-24 22:17:47 +00:00
Vadim Zeitlin
cd747e1598 Append all items at once during wxChoice creation in wxMSW.
Appending all items at once is more efficient than doing it one by one in the
loop 9probably because of CB_INITSTORAGE that we send in this case).

Closes #13899.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-24 21:50:34 +00:00
Paul Cornett
968c75e366 add strike-through font support to wxGraphicsContext on GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-24 18:07:45 +00:00
Stefan Csomor
5dd0719e6a adding missing stubs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 21:06:07 +00:00
Vadim Zeitlin
cec8d6774a Add unit test verifying compilation of various wxFont ctors.
Check that various invocations of wxFont ctor at least compile to avoid
problems like the ones fixed by r70450.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 14:42:56 +00:00
Vadim Zeitlin
9aa727fa7d Fix wxButtonToolBar compilation after adding new wxFont ctor overload.
The new wxFont ctor added in r70445 resulted in ambiguity when using
wxFont(int, wxFontFamily, wxFontStyle, int) ctor mixing the type-safe values
for the 2nd and 3rd arguments with "untyped" int for the 4th one. Fix this by
avoiding the use of this ctor as it seems impossible to do it in any other
way.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 14:42:53 +00:00
Vadim Zeitlin
2d5409f936 Add a property to configure file property dialog kind.
Add wxPG_FILE_DIALOG_STYLE allowing to pass wxFileDialog style that should be
used by the given wxFileProperty. This notably allows to have file properties
accepting not yet existing files, as is needed when using them for the file
names to be saved, not opened.

Closes #13894.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 13:59:52 +00:00
Vadim Zeitlin
6e43a69f06 Fix wxTextAttr::m_fontStrikethrough initialization.
The code added in r70447 didn't initialize m_fontStrikethrough correctly.

This fixes unit test failures for wxRichTextCtrl that appeared since this
change.

See #9907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 12:33:03 +00:00
Vadim Zeitlin
2099fa90cb Implement support for stricken-through fonts in markup parser.
Now that we have strike-through support in wxFont, implement support for <s>
tag in the markup parser.

See #9907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:28:32 +00:00
Vadim Zeitlin
c7a49742ec Add support for stricken-through fonts.
Support stricken-through fonts in wxMSW and wxGTK (including special support
in wxStaticText and wxTextCtrl).

Closes #9907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:28:28 +00:00
Vadim Zeitlin
0634700a96 Add wxFont ctor taking a single flags argument instead of style/weight/...
Currently this ctor just does the same thing as the existing ctors in a
different way but it will be extended to support wxFONTFLAG_STRIKETHROUGH in
the next commits.

See #9907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:28:21 +00:00
Vadim Zeitlin
5c7fe47762 Fix wxAffineMatrix2D::Translate() to multiply on the left.
The affine transform was previously multiplied by the translation matrix on
the right but this was incompatible with both the MSW version of the same
method and all the other methods of the generic version.

So multiply the transform by the translation on the left, as everywhere else.

Closes #13875.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:28:16 +00:00
Vadim Zeitlin
7fa7e46b26 Fix incorrect scroll positions used in SetScrollbars().
SetScrollbars() passed its input positions expressed in scroll units to
CalcUnscrolledPosition() which takes positions in pixels. This was definitely
wrong so don't do this and perform the conversion from scroll units to pixels
in SetScrollbars() itself for clarity instead.

It's not clear what concrete bugs, if any, does this fix as the calculated
positions are almost never used anyhow but the old code was obviously
incorrect and the new version has a chance of not being wrong so it's already
an improvement.

Closes #9988.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:28:12 +00:00
Vadim Zeitlin
8ca4b822b9 Add check for wxFileCtrl dependency on wxDateTime to wx/chkconf.h.
Enable wxDateTime if it's disabled but wxFileCtrl is enabled as the latter
needs the former, at least in the generic version.

Closes #12821.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:28:09 +00:00
Vadim Zeitlin
d34791c2be Fix incorrect cast resulting in a warning in wxMSW wxMenu code.
Menu id is a 32 bit UINT value, even in 64 bit builds, so don't cast it to
UINT_PTR.

Closes #13815.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:28:05 +00:00
Vadim Zeitlin
fbf9fe29f9 Avoid warnings about mismatched format string in wxMSW wxClipboard code.
Cast the string offsets to "unsigned" explicitly, even though they can be 64
bit (whereas unsigned is 32 bits) under Win64, the strings we operate with
here shouldn't be more than 4GiB long.

See #13815.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:28:01 +00:00
Vadim Zeitlin
eff97cba04 Update OS X toolkit names list in wxwin.m4.
There is no more "mac" toolkit in 2.9, we have "osx_carbon" and "osx_cocoa"
instead (and also "osx_iphone" but it's not used with configure so far).

Closes #13817.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:27:57 +00:00
Stefan Csomor
301c0f4ca0 using existing member
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-23 11:15:18 +00:00
Stefan Neis
620c589323 Fixed typo in variable name, fixing #13872.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-22 17:27:09 +00:00
Vadim Zeitlin
f7f7b59ab2 Added a simple benchmark of wxLogDebug() and wxLogTrace().
Measure time taken by these calls when the debug/trace messages are not
enabled.

See #11829.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-22 00:58:09 +00:00
Vadim Zeitlin
7e57c9042a Create wxStaticText with correct label directly in wxTextSizerWrapper.
This is shorter and arguably more clear than doing it in two steps as we did
before and also works in wxUniv, unlike creating wxStaticText with empty label
and setting it later.

Closes #13858.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-22 00:58:05 +00:00
Vadim Zeitlin
c8fb50b794 Fix reparenting generic wxSpinCtrl.
The existing Reparent() implementation was wrong as it reparented spin control
subwindows under the new parent but left the main window itself under the old
one. Fix this by just not overriding Reparent() at all, the inherited version
works just fine for this control.

Closes #13849.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-21 17:03:52 +00:00
Dimitri Schoolwerth
6e9d06080d deleted CodeWarrior project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-21 00:53:21 +00:00
Dimitri Schoolwerth
fdfa35b4d7 Fixed mismatch in amount of format specifiers in Japanese translation for i18n sample.
The translation was missing a %s, copied the translation from the same string at samples/internat/ja/internat.po.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-21 00:01:00 +00:00
Vadim Zeitlin
71f44b1bc4 Update the message catalog charset expected by the unit test.
The charset of the message catalog files changed to UTF-8 in r70411 but the
unit test still expected ISO-8859-1. Update the unit test too to make it pass
again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 23:18:29 +00:00
Vadim Zeitlin
421388f204 Fix time zone in wxDateTime::UNow().
The internal wxDateTime representation is in the UTC, so use
wxGetUTCTimeMillis() in UNow(), using wxGetLocalTimeMillis() made it
inconsistent with Now() and wrong.

Really closes #13862.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 22:11:55 +00:00
Vadim Zeitlin
f2c6e60762 Ensure wxCharTypeBuffer data is NUL-terminated after extend() call.
As wxCharTypeBuffer ctor taking the length NUL-terminates the buffer, it may
be expected that extend() does the same but it did not. Do add the NUL at the
end for consistency, even though it's not really needed for the existing code
using extend() in wxWidgets itself.

Closes #13885.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 22:11:51 +00:00
Vadim Zeitlin
0c99d1fb56 Fix documentation of wxConfig::Read(float*) overload.
Grouping methods using "//@{" and "//@}" apparently doesn't work and
completely wrong documentation is used in this case, so document the two
overloads separately, as it's done for the other methods.

Closes #13884.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 22:11:47 +00:00
Vadim Zeitlin
6f46510c80 Add error checking when retrieving client data from wxMSW wxListBox.
Verify if retrieving client data failed which might happen if the index
is invalid for example. This makes code more robust and also consistent with
wxChoice.

Closes #13883.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 22:11:44 +00:00
Vadim Zeitlin
85a39457f9 Check that an error really occurred when getting wxChoice data in wxMSW.
We could wrongly return NULL client data if -1 was stored as client data in
wxChoice because it's the same value as CB_ERR and we always interpreted it as
an error, while it may not be one if GetLastError() doesn't indicate it.

See #13883.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 22:11:39 +00:00
Vadim Zeitlin
04ca40fce8 Destroy modeless wxGenericAboutDialog when it is closed.
Don't leave the wxGenericAboutDialog object alive when non-modal about dialog
(as can be used under GTK and OS X) is closed. This is wasteful and, worse,
resulted in the program not exiting after such a dialog was shown because it
counted as a remaining open top level window.

This also fixes the same bug in wxGTK when using GTK+ 2.4.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 22:11:32 +00:00
Dimitri Schoolwerth
2d143b6689 Removed ellipsis from "About..." occurrences.
MS and Apple guidelines mention ellipses should generally be used when a command needs additional information from the user before the operation can execute. This is not the case for showing an about dialog so the ellipses have been removed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 16:51:09 +00:00
Dimitri Schoolwerth
ecc8721a0a Changed .po files to use UTF-8 charset.
Changing the localisation files to be in UTF-8 allows them to be committed by the pre-commit hook script.

Also regenerated relevant .mo files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 16:33:41 +00:00
Vadim Zeitlin
c612bbeca6 Reset next wxMenu event handler in wxUniv when detaching it from wxMenuBar.
A detached menu must not send its events to the menu bar that it isn't part of
any longer.

Closes #2620.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 12:35:14 +00:00
Vadim Zeitlin
5f519da23d Try to avoid truncation of the message in wxMSW wxMessageDialog.
Use (documented but undefined) TDF_SIZE_TO_CONTENT flag under Windows Vista/7
to reduce the chance that Windows truncates or ellipsizes the message text if
it can't wrap it.

Truncation can still happen for very long words but there doesn't seem to be
any drawbacks to using TDF_SIZE_TO_CONTENT and it does avoid truncation in at
least some cases.

This also improves the situation for wxRichMessageDialog and wxProgressDialog.

Closes #13843.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 12:30:08 +00:00
Vadim Zeitlin
ab9d6a4c8b Add SetPostBuffer(wxMemoryBuffer) and SetPostText() to wxHTTP.
This allows to post binary data or text data in e.g. UTF-8 encoding (which is
by far the most common case) easily.

Deprecate the existing SetPostBuffer(wxString) as it didn't explicitly specify
the encoding to use for the data to be posted.

Closes #13870.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 12:22:25 +00:00
Vadim Zeitlin
846b6c8658 Added wxMemoryBuffer::Clear() and IsEmpty() methods.
Add two convenient methods which may be used instead of testing or setting the
buffer length.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-20 12:22:22 +00:00
Vadim Zeitlin
11c278c43c Respect image mask in the docview sample.
Draw images with transparency, if any.

See #13881.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 22:17:17 +00:00
Stefan Csomor
41749c76d8 adapting to new raw_control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 15:09:02 +00:00
Stefan Csomor
7b7dc4a22b fixing m_axe access indices
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 15:06:22 +00:00
Stefan Csomor
052318dfe8 guard against invalid color ref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 15:01:47 +00:00
Stefan Csomor
d6eb3ff8a1 solving include order problems for stl and xti
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 15:01:01 +00:00
Stefan Csomor
5f4bed8ad4 use better backward compatibility for menu_open, don't autoenable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 14:59:35 +00:00
Stefan Csomor
405f35e560 guard against invalid color ref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 14:06:36 +00:00
Stefan Csomor
d7872f625f solving include order problems for stl and xti
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 14:04:47 +00:00
Stefan Csomor
dd45d2848b attempt for workaround for stl forward declaration problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 09:50:46 +00:00
Stefan Csomor
eb5159969d gcc 4.3 issues warning if type attributes are given again - even if they are identical - therefore comment them out
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 09:45:49 +00:00
Stefan Csomor
9ae4b67f28 gcc 4.3 issues warning if type attributes are given again - even if they are identical - therefore comment them out
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 09:00:29 +00:00
Stefan Csomor
6b882f87aa adding unix defaults
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-19 08:55:41 +00:00
Vadim Zeitlin
615f68c6b9 Skip EVT_RIGHT_UP event in wxHtmlWindow if it wasn't handled.
This fixes generation of EVT_CONTEXT_MENU for mouse clicks in wxHtmlWindow
under MSW: it wasn't generated before because we always ate the right mouse
clicks.

Closes #2465.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 23:12:03 +00:00
Dimitri Schoolwerth
ebfe373ee7 replaced _T() usage with wxT()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 23:10:59 +00:00
Vadim Zeitlin
e1db4c1290 Avoid needless second string conversion when adding files to memory FS.
Create the buffer holding the result of conversion instead of converting
twice, once to only get the length of the result and the second time to get
the data.

Closes #13877.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 19:42:58 +00:00
Bryan Petty
ce45dbe3c8 Gave proper spacing to header include sections.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 19:14:16 +00:00
Dimitri Schoolwerth
7e528ef6d1 Synchronised svn:eol-style and svn:executable properties of some file types.
Changed the properties of the following file types:

.am .m4: LF
.plist .plist.in: native
.guess .sh .sh.in .sub: LF, executable


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 18:00:07 +00:00
Dimitri Schoolwerth
722813702f merged libpng 1.5.7 to trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 17:55:54 +00:00
Vadim Zeitlin
a47ad3591b Don't auto-link with 3rd party libraries in DLL build using MSVC.
It's unnecessary to link with these libraries as they're already embedded
inside our DLLs and the functions from them can't be used anyhow as they're
not declared as DLL-exported in the libraries headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 17:26:23 +00:00
Stefan Csomor
fb2281054c fixing RTTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 14:19:01 +00:00
Stefan Csomor
31ba1c7e33 adding conversion for stl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 14:05:39 +00:00
Vadim Zeitlin
be85a191e1 No changes, just minor wxMSW code cleanup: use WinStruct<>.
Use WinStruct instead of the usual ZeroMemory() + cbSize setting fragment to
initialize Win32 structs that need to be initialized in this way.

No real changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 10:05:27 +00:00
Vadim Zeitlin
89041b2513 Fix header formatting problem in wxMessageBox() documentation.
@header macro must be preceded by a new line.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 09:51:38 +00:00
Javier Torres
eda3c4d770 Removed wxQt build slave
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 00:25:17 +00:00
Vadim Zeitlin
24a03ec521 Consistently use "checked" in wxRadioButton documentation.
We used "depressed" or "selected"; replace both of them with hopefully more
clear "checked".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 23:48:01 +00:00
Stefan Csomor
a39815bd30 missing commit, see #10269
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 21:54:02 +00:00
Julian Smart
8db2e3ef15 Added drawing context to allow 'virtual' (dynamic) attributes, for e.g. showing bookmarks without affecting the content
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 20:03:13 +00:00
Václav Slavík
907f09f44b Replace wxDataViewCtrl::StartEditor() with EditItem().
This is more consistent with other wxDVC methods (taking column pointer
as its argument) and other DVC-like classes where the name EditLabel()
is used for similar purposes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 14:05:17 +00:00
Václav Slavík
9944f9c6f3 Removed unused, wrong wxDataViewCtrl code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 14:05:11 +00:00
Václav Slavík
ee1377e1fa Add wxDataViewCtrl::GetCurrentColumn().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 14:05:07 +00:00
Julian Smart
590a0f8bcb Support for undoable application of custom properties, and customisation of properties menu label
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 12:56:53 +00:00
Dimitri Schoolwerth
d1852ec0c3 Deleted SetTypeFromExtension.sea.hqx.
The script or application in this file was used to set the file type for CodeWarrior projects on the Mac. Since that IDE is not supported anymore and OS X is moving away from file and creator types the file can be deleted.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 06:18:01 +00:00
Dimitri Schoolwerth
877af9bdd5 Deleted makefile.mgl.
The makefile referred to a file in src/mgl/, wxMGL has been removed since r70353 so this makefile can be deleted.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 06:12:17 +00:00
Dimitri Schoolwerth
33b26197a5 Fixed keyboard navigation in generic tree control.
Under MSW any cursor key presses would not be handled by the generic tree control (and it would lose focus). Added the style wxWANTS_CHARS to the creation of wxGenericTreeCtrl to fix keyboard navigation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 06:06:34 +00:00
Julian Smart
e9a16019a8 Fixed duplicate comment #13871
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-16 19:02:19 +00:00
Vadim Zeitlin
82ab1ab113 Only return the requested data from generic wxListCtrl::GetItem().
For compatibility with MSW, only return the data that was requested by the
item mask from wxListCtrl::GetItem(). This harmonizes the behaviour between
all ports.

Closes #1621.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-16 13:37:18 +00:00
Vadim Zeitlin
14841e5a8e Set all event fields correctly for drag events in generic wxListCtrl.
Call SendNotify() instead of (ponly partially) duplicating it in the code
generating wxEVT_COMMAND_LIST_BEGIN_[R]DRAG.

Closes #1582.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-16 13:37:14 +00:00
Vadim Zeitlin
6627ac2da2 Remove more non-standard keywords from wxWebView MSW header.
Complete the changes of r70365 by removing the rest of __out, __in and
__nullterminated occurrences.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-16 12:56:09 +00:00
Steve Lamerton
96457e6705 Remove MSVC specific specifiers from wxWebView code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-16 08:21:33 +00:00
Vadim Zeitlin
8def3e6ee3 Fix another typo in section names in the XRC overview.
Replace triple "t" with just a double one in "button".

See #13868.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 23:39:57 +00:00
Vadim Zeitlin
718dd5e340 Fix wxBitmapToggleButton section name in XRC format overview.
It mistakenly had the same name as wxToggleButton section.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 23:28:54 +00:00
Steve Lamerton
accc94d55c Implement IDocHostUIHandler in wxWebViewIE to improve the default behaviour. Disable built-in keyboard handlers, remove the 3D border and enable themes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 19:19:00 +00:00
Steve Lamerton
1f7d05f019 Add wxActiveXContainer::QueryClientSiteInterface to allow customisation of ActiveX controls.
Closes #13784.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 19:05:34 +00:00
Vadim Zeitlin
8ae52ef8cc Fix minor errors in XRC format overview.
Correct the tag in an example and a section name.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 18:54:27 +00:00
Vadim Zeitlin
f2012fa639 Remove __WXMGL__ tests from the samples too.
__WXMGL__ is not used any longer, remove it from the samples too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 18:50:35 +00:00
Julian Smart
303f0be79e Added min and max size to box attributes; made property editing more customisable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 18:26:58 +00:00
Václav Slavík
2148394afb Don't crash if XRC file contains '_' at the end of a string.
Parsing code for translating between '_' and '&' didn't properly handle
the case when the input was malformed and '_' wasn't followed by either
another '_' or another character. Added a check to guard against this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 17:45:14 +00:00
Stefan Csomor
9c71750d80 native maxlength support, fixes #10269 (for osx_cocoa)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 15:55:58 +00:00
Stefan Csomor
6d155f1f31 removing duplicated method, wiring native maxlength support, see #10269
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 15:54:53 +00:00
Stefan Csomor
4386db06ba allow native max length support, see #10269
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 15:53:56 +00:00
Vadim Zeitlin
0e1f8ea4a3 Remove wxMGL port.
The company behind MGL toolkit (SciTech) doesn't exist since several years and
this port is not used by anybody, so remove it to ease maintenance burden.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 14:46:41 +00:00
Vadim Zeitlin
4ff56dd152 Remove empty PalmOS-related directories.
And one file (in build/wince/missing).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 13:46:35 +00:00
Vadim Zeitlin
a73d72ae4a Remove more Palm OS left overs.
Remove the build files and the mentions of Palm OS in the widgets sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 13:43:19 +00:00
Vadim Zeitlin
e4a23857ec Implement wxMenuBar::EnableTop() for wxMSW and wxGTK.
This method was only available in wxUniv before and just always returned true
in the other ports. Implement it for wxMSW and wxGTK too now and document it.
Also add a unit test.

Closes #795.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 13:41:17 +00:00
Vadim Zeitlin
2db3b9a6a4 Fix unit test build with wxUSE_ZIPSTREAM or wxUSE_TARSTREAM == 0.
Disable the tests using wxZipEntry when it's unavailable. Also do the same for
wxTarEntry.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 12:28:57 +00:00
Vadim Zeitlin
28c2cd426a Fix variable name in wxFTP example in the documentation.
The variable should be called "in", not "i".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 12:28:54 +00:00
Vadim Zeitlin
3f42c23971 Document wxFileCtrl as being in the core library, not in the base one.
Closes #13866.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 12:28:50 +00:00
Stefan Csomor
77dcae2005 patch applied with thanks, fixes #13865
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 11:18:25 +00:00
Vadim Zeitlin
bd362275b8 Remove Palm OS port.
The platform targeted by this port doesn't exist any more and the port never
achieved really working state so remove the code to avoid having to maintain
it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 01:05:28 +00:00
Vadim Zeitlin
215ab2b53e Remove the documentation of non-existent wxNO_T macro.
Don't document wxNO_T as it doesn't exist.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 01:05:07 +00:00
Vadim Zeitlin
af36ec0aa1 Correct wrong checks for wxUSE_OWNER_DRAWN.
Fix the checks added in r70316, wxUSE_OWNER_DRAWN should have been used
instead of inexistent and undefined wxUSE_OWNER_DRAW.

See #13851.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 01:01:44 +00:00
Paul Cornett
ef1e09f852 in addition to key events, also prevent unhandled mouse events from propagating up parent chain
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-14 19:54:50 +00:00
Vadim Zeitlin
be74a2a21a Fix the size of the font returned from wxTextCtrl::GetStyle() in wxMSW.
Due to a typo the size was expressed in 1/10th of a point and not in points.
Fix this and add a unit test checking that GetStyle() returns the same font as
was set by SetStyle().

Closes #2120.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-14 17:57:11 +00:00
Vadim Zeitlin
821073e386 Update wxNotebook selection when user changes the page in wxOSX.
wxNotebook::m_selection was only updated if the selected page was changed
programmatically but not if it was done by the user. Do update it in this case
as well, it fixes generation of the events which was broken before because of
comparison of the new selection with the incorrect current selection value in
m_selection.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-14 17:57:08 +00:00
Václav Slavík
50703c1a72 Fix wxDataViewCtrl::GetMainWindow() signature on OS X.
Return wxWindow* as other ports do, not wxControl*.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-14 16:52:01 +00:00
Václav Slavík
5313727812 Make column width calculations in wxDataViewCtrl and wxHeaderCtrl consistent.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-14 16:51:57 +00:00
Robin Dunn
b1b3236700 add post-commit to svn too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-13 19:03:41 +00:00
Robin Dunn
5caded2201 Also exclude generated wxPython html files from pre-commit checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-13 18:57:57 +00:00
Vadim Zeitlin
8c7114c227 Call tzset() for all compilers before using time zone variable.
Changes of r66245 shouldn't have been specific to MSVC, we must call tzset()
when using any other compiler as well, otherwise time zone information can be
initially incorrect.

Closes #13862.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-13 11:36:33 +00:00
Vadim Zeitlin
b98b75cddf Correct handle passed to DocumentProperties() in MSW printing code.
We were passing a pointer to our wrapper struct instead of the pointer stored
inside it (as a HANDLE).

Closes #13861.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-13 11:32:44 +00:00
Vadim Zeitlin
19378461c4 Update broken link to manifest documentation on MSDN.
Closes #13860.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-13 11:29:33 +00:00
Jouk Jansen
31f3781261 Update makefiles for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-13 08:00:48 +00:00
Vadim Zeitlin
c0211f554c Correct wxDropSource constructors documentation.
The types of the arguments (wxCursor vs wxIcon) were inversed. Even though the
description correctly said that wxCursor version was used by MSW and wxIcon --
by wxGTK the converse was actually documented.

Fix this and also mention OS X.

Finally remove the unnecessary and useless destructor documentation.

Closes #13856.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-12 18:15:12 +00:00
Paul Cornett
aae3b9d5ca revert r70315, key event propagation should be fixed by r70324
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-12 18:06:32 +00:00
Paul Cornett
b6e51ead97 prevent unhandled key events from propagating up parent chain
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-12 18:06:07 +00:00
Vadim Zeitlin
120b598609 Added Lithuanian translations.
Initial translations into Lithuanian from bricsys.com.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-12 14:19:50 +00:00
Steve Lamerton
cb9a0fbe65 Add missing aui dependencies to the notebook sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-12 10:26:51 +00:00
Václav Slavík
49f89f4d4b Don't react to Enter/Space/F2 with modifiers in generic wxDataViewCtrl.
Doing so was in conflict with system shortcuts; Alt+Space in particular
is used by Windows.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-11 13:42:53 +00:00
Vadim Zeitlin
8ba1d512d3 Only declare wxDialog::SetWindowStyleFlag() when wxUSE_DIALOG_SIZEGRIP.
This method was only defined when wxUSE_DIALOG_SIZEGRIP==1 so avoid declaring
it when wxUSE_DIALOG_SIZEGRIP==0 to fix compilation in this case (i.e. under
Windows CE).

Closes #13852.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-11 13:42:06 +00:00
Vadim Zeitlin
51c2f7ea41 Add wxUSE_OWNER_DRAW checks to wxMSW wxMenu code.
Allow compiling with wxUSE_OWNER_DRAW==0. This fixes another problem in
Windows CE build where owner drawn menus are not supported.

Closes #13851.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-11 13:42:02 +00:00
Vadim Zeitlin
29686ebc00 Fix UI in generic wxListCtrl when pressing cursor arrows while editing.
Pressing Up/Down keys while editing an item changed the selection but left the
in-place editing control on the previously selected item which was just wrong.
Ignore these keys to avoid it.

Notice that there is an underlying bug somewhere in wxGTK because we shouldn't
be getting these events in the first place while the in-place editing text
control has focus but it doesn't seem easy to fix so work around it here.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-10 23:11:39 +00:00
Dimitri Schoolwerth
5e9b80221a Fixed clicking on MSW slider not changing value with small ranges.
If the range was 9 or less the SetPageSize call would pass a page size of 0, resulting in the value not being changed when clicking on the slider area (outside the thumb). Fix this by at least passing a page size of 1 to SetPageSize.

Closes #1608.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-10 17:09:11 +00:00
Vadim Zeitlin
102db80fb5 Fix wxFrame::AttachMenuBar() compilation under Windows CE.
There was a typo in GetHwnd() call.

Closes #13848.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-10 17:01:20 +00:00
Vadim Zeitlin
d58c7af849 Use wxAbort() instead of abort() to fix Windows CE build.
abort() is not defined under CE.

Closes #13847.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-10 17:01:17 +00:00
Vadim Zeitlin
975dc6910e Added wxAbort() which can also be used under Windows CE.
Windows CE doesn't have abort() so provide a wrapper which can be used even
there (see #13847).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-10 17:01:13 +00:00
Vadim Zeitlin
864c08b2ed Add missing wxUSE_TOOLTIPS and wxUSE_UXTHEME checks to wxMSW.
Allow compiling wxStatusBar without tooltips and theme support.

Closes #13846.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-10 17:01:09 +00:00
Václav Slavík
f52f37959d Don't crash in generic wxDataViewCtrl if selected column is removed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 18:59:23 +00:00
Vadim Zeitlin
f1cfa1132c Add check for _T() to svn pre-commit hook.
_T() shouldn't be used in any new code so don't allow committing it.

We could have used "svnlook diff" instead of "svnlook cat" and check only for
_T() not being added but in practice there shouldn't be any difference and
using "cat" is simpler.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 18:48:42 +00:00
Vadim Zeitlin
ebd98179c5 Use wxT() instead of _T() in XTI code.
_T() is deprecated and doesn't work with Solaris compiler, use wxT() instead.

Also change one occurrence of _T() inside a comment in wx/debug.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 18:48:39 +00:00
Vadim Zeitlin
9349c84fdb Use wxT(), not _T(), in wxRichText code.
_T() doesn't compile with Sun CC and is deprecated, please don't use it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 18:48:36 +00:00
Vadim Zeitlin
3b7e7e2497 Resolve ambiguity between two wxAuiNotebook overloads.
wxAuiNotebook-specific InsertPage() and the version inherited from
wxBookCtrlBase were ambiguous if used with default values for their 2 last
arguments. Resolve this by removing defaults from the inherited version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 18:48:34 +00:00
Julian Smart
bb7bbd12d3 Improved layout, in particular passed a container size in order to allow relative size calculation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 14:19:50 +00:00
Dimitri Schoolwerth
d9384bfb6d no code changes, fixed some typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 14:04:25 +00:00
Jouk Jansen
9fa7b43626 Correction for the #define wxUSE_DRAG_AND_DROP 0 case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 07:18:19 +00:00
Paul Cornett
02800dde9e move render params out of wxDataViewCustomRenderer
they only need to exist for the duration of the render() call

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 06:31:07 +00:00
Julian Smart
1199fbd4e0 Fixed default style setting to take into account text boxes; fixed AddBoxStyle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 18:27:47 +00:00
Vadim Zeitlin
1076e695b4 Fix menu creation in wxOSX/Carbon when using wx in a plugin.
In this case the host application may have its own menu so we need to avoid
conflicting with its menu elements.

Closes #13832.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 14:52:59 +00:00
Vadim Zeitlin
d1bf0be0bc Enhance wxRibbonToolBar functionality to wxRibbonButtonBar level.
Allow inserting and deleting tools and not only appending them.

Add possibility to enable/disable and toggle tools.

Send wxUpdateUIEvent for the tools.

Add various properties accessors.

Closes #13835.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 14:52:56 +00:00
Vadim Zeitlin
becc95d84b Don't generate drag events without valid item in wxGenericListCtrl.
Dragging the mouse from the empty area of the control must not generate any
drag events as there is nothing to drag there. Also, MSW version doesn't do
it.

So fix the generic version to avoid generating such invalid drag events too by
checking that we have a valid item before checking that we're dragging.

Closes #1619.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 14:52:51 +00:00
Vadim Zeitlin
6a0e4ead1e Add wxTopLevelWindow::SetRepresentedFilename().
This currently is only implemented under OS X and sets the proxy icon there
but could be implemented to do something useful under the other platforms too
in the future.

Closes #13797.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 14:52:47 +00:00
Vadim Zeitlin
bc5bb77365 Another wxOSX/Carbon compilation fix after wxListCtrlBase changes.
Fix DoInsertColumn() parameter const-ness too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 10:54:28 +00:00
Paul Cornett
2df9f4581c use correct signature for init functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 07:12:35 +00:00
Paul Cornett
8a724edb3d remove unnecessary class definitions and variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 06:40:26 +00:00
Paul Cornett
8945688a86 remove unnecessary finalize overrides
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 06:30:55 +00:00
Vadim Zeitlin
0482be5e1d Fix wxOSX/Carbon compilation after wxListCtrlBase introduction.
Make wxListCtrl::SetColumn() item parameter const reference.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 00:55:22 +00:00
Vadim Zeitlin
22f772f8e3 Compilation fixes to joystick sample after r70279.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 16:35:02 +00:00
Vadim Zeitlin
0dc45ad6b5 Compilation fix for PCH-less build after wxListCtrlBase changes.
Include the base class declaration from wx/listbase.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 16:11:10 +00:00
Vadim Zeitlin
3d167c0022 Improve column auto-sizing code in generic wxListCtrl.
Take the width of the header itself into account when setting width to
wxLIST_AUTOSIZE.

Also refactor the code to reuse the code used in wxLIST_AUTOSIZE_USEHEADER
case in SetColumnWidth() when inserting or updating the column width to this
value.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 15:09:54 +00:00
Vadim Zeitlin
0fb731b8bf Add support for wxLIST_AUTOSIZE_USEHEADER to InsertColumn().
Use the fixed default width in InsertColumn() by default for compatibility but
allow more useful behaviour in it by supporting wxLIST_AUTOSIZE_USEHEADER as
well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 15:09:51 +00:00
Vadim Zeitlin
c23edb1b71 Add convenient wxListCtrl::AppendColumn() wrapper.
In the vast majority of cases, columns are just appended to the end and not
inserted at arbitrary positions in wxListCtrl so provide a convenient wrapper
to do this, especially as it's really trivial to do it now when it can be done
only once at wxListCtrlBase level.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 15:09:47 +00:00
Vadim Zeitlin
94248d2ed1 Implement best size calculation for report mode wxListCtrl.
Use the column labels to determine the minimal width required by the control
to show them all in full.

Also declare all image list and column-related wxListCtrl methods in
wxListCtrlBase now as we need some of them in DoGetBestClientSize()
implementation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 15:09:43 +00:00
Vadim Zeitlin
a9bd911fde Replace 3 copies of wxListCtrl mode tests with a single one in wxListCtrlBase.
Move InReportView() and IsVirtual() into the base class as they were the same
in all the implementations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 15:09:37 +00:00
Vadim Zeitlin
26df5dd39a Add wxListCtrlBase common base class for port-specific wxListCtrl.
This base class is currently trivial, more methods will be moved to it from
the derived classes later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 15:09:34 +00:00
Vadim Zeitlin
3b2f80c205 Set Z-position correctly for wxEVT_JOY_ZMOVE events.
Z-move events don't have (x, y) position, but they do have Z-position which
needs to be set.

Also don't use (x, y) position for these events in the sample.

See #748.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 15:09:29 +00:00
Vadim Zeitlin
f9aa52355e Joystick messages coordinates are unsigned, treat them as such.
Apparently the joystick messages (x, y) coordinates are unsigned, so use
LOWORD/HIWORD to extract them from LPARAM.

See #748.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-07 15:09:24 +00:00
Julian Smart
4e63bfb9b3 Removed compilation ambiguity between different forms of ...WithUndo functions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 15:48:21 +00:00
Julian Smart
b9433288e4 Fixed box style application.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 14:10:24 +00:00
Julian Smart
61e6149e58 Fixed #13833: wxRichTextCtrl: 'Copy' can grab an extra character
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 14:08:52 +00:00
Vadim Zeitlin
18dd537805 Ensure that wxListEvent::m_itemIndex and m_item.m_itemId are in sync.
Unfortunately we have two ways to get the item affected by wxListEvent: via
its m_itemIndex (or GetIndex()) and m_item.m_itemId (or GetItem()). This can't
be changed for the usual backwards compatibility reasons but at least make
sure that both contain the same values in the events sent by the generic
version (MSW one already did it).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 12:51:42 +00:00
Vadim Zeitlin
8c62f53ee2 Don't fill wxListEvent::m_item when using virtual list control in wxMSW.
When using virtual list control the main program already has the items data so
it's completely useless to call GetItem() when preparing an event for it. It
is also inefficient to call GetItem() for potentially many items.

For both of these reasons the generic version already didn't fill the item
contents for virtual list controls events. Now modify wxMSW to not do it
neither.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 12:51:40 +00:00
Vadim Zeitlin
1e40bd4c74 Initialize wxListItem::m_itemId to -1, not 0.
Currently we have two redundant pieces of data in wxListEvent: m_itemIndex and
m_item.m_itemId. The former is initialized to -1 by default which makes sense
as it means "no item". But the latter was 0 by default which not only didn't
make sense but also made it inconsistent with m_itemIndex for the events which
really didn't have any associated item.

Fix this by initializing m_itemId to -1 as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 12:51:37 +00:00
Vadim Zeitlin
86d19346c5 Fix wxDateTime unit test compilation without PCH.
Include wx/time.h to get wxGetTimeZone() declaration.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 10:21:46 +00:00
Vadim Zeitlin
444bc2b24d Implement support for "%z" in wxDateTime::Format() and Parse().
"%z" specifier can now be used when printing the dates out to specify the time
zone and is also recognized when parsing dates.

Closes #1215.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 00:47:10 +00:00
Julian Smart
cd72035387 Added box style functionality to style manager dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 19:38:31 +00:00
Julian Smart
eb3d8a3319 Implement missing wxTextBoxAttr::IsDefault function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 16:32:08 +00:00
Vadim Zeitlin
2f783a2390 More pt_BR translations from Felipe.
All the messages are now translated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 15:53:08 +00:00
Julian Smart
cd45ed3622 Possible fix for #13821: wxRichTextCtrl using 100% CPU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 14:41:29 +00:00
Julian Smart
37e7b7838c Background now drawn within the border instead of beyond the margin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 14:00:29 +00:00
Vadim Zeitlin
f8193bbb14 Fix wxRibbon compilation when wxUSE_TOOLTIPS==0.
Add wxUSE_TOOLTIPS tests after the changes of r70175.

Closes #13827.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 13:39:23 +00:00
Julian Smart
63af79dee1 Fixed border drawing bug when width is more than 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 12:50:47 +00:00
Jouk Jansen
5024d0ac1e Update makefile for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 10:42:11 +00:00
Stefan Csomor
916a96c961 fixes #13826
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 07:54:00 +00:00
Vadim Zeitlin
13b4df952c Fix wxEncodingConverter::Convert(wchar_t) documentation.
This method mistakenly "inherited" the same documentation as 2 argument
Convert() overloads.

Closes #13825.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 23:27:50 +00:00
Julian Smart
b33e0c2c5b Disable drag and drop if the control is not editable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 15:24:20 +00:00
Julian Smart
0c0e063e66 Applied #13819: wxRTC drag and drop, by dghart, with tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 14:09:34 +00:00
Stefan Csomor
606e096810 fixes #13695
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 10:53:12 +00:00
Stefan Csomor
ed1ebd3908 adapting to new raw_control constants, see #13695
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 10:34:14 +00:00
Vadim Zeitlin
59cd3bbd6c Fix child selection in multi-selection generic wxTreeCtrl.
The children which are not currently shown on the screen shouldn't be affected
by Shift-selecting in multi-selection control.

Closes #1312.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 00:44:47 +00:00
Vadim Zeitlin
94cac3bf82 Improve links in wxAuiManager flags documentation.
Use @param tags and "::" to link enum name.

Closes #13689.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 00:40:32 +00:00
Vadim Zeitlin
bb65ca31d7 Document wxIMAGE_OPTION_CUR_HOTSPOT_[XY] in wxCursor ctor.
These options were already mentioned in wxCursor documentation but not
prominently enough, so mention them explicitly in the documentation of
wxCursor ctor from wxImage.

Closes #13820.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 00:40:27 +00:00
Vadim Zeitlin
3ecb578aa9 Correct documentation of supported cursor sizes under wxOSX.
wxOSX/Cocoa seems to support cursors of any size and with colours.

Closes #12614.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 00:40:22 +00:00
Robin Dunn
68a1c7d38f Be a little smarter about choosing the default SDK to use.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-02 22:28:51 +00:00
Julian Smart
2f987d8309 Added a box style definition name to the box attribute.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-02 21:18:05 +00:00
Bryan Petty
3e14a8d3d7 Fixed javascript errors in CHM version of the manual.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-02 01:32:20 +00:00
Julian Smart
eadb039ed5 When the focus object changes, the old selection should be
cancelled explicitly to avoid seeing multiple selections until the next
refresh.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-30 17:22:11 +00:00
Julian Smart
9b794421ae Split up the context menu functionality to make it easier to customise.
Tweaked style combobox popup border.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-30 17:12:37 +00:00
Václav Slavík
cf5d4c76af Implement wxDataViewModel::IsEnabled() support in generic implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-30 14:28:13 +00:00
Robin Dunn
50e55c13ea Interface fixes and tweaks for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-30 06:14:17 +00:00
Vadim Zeitlin
e4aadc2f1d Update wxGrid unit tests after r70177.
The row/column selection is not stored in the block arrays, see #12638.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 23:39:27 +00:00
Vadim Zeitlin
8709d9472b Allow using '(' and ')' in wxFileConfig entry names unescaped.
There is no real reason to escape the parentheses in the key entries, they're
not special.

Closes #13584.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:11:11 +00:00
Vadim Zeitlin
c75e580c0e Document wxAuiManager styles and flags.
Closes #13689.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:50 +00:00
Vadim Zeitlin
4707c7c3d1 Disable VC8+ deprecation warnings for standard functions at bakefile level.
We already define the symbols needed to disable the warnings in wx/defs.h but
this isn't enough for third party code not including it, so define them in the
project settings directly.

Closes #11009.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:46 +00:00
Vadim Zeitlin
ff4cb9160e Add wxRibbonButtonBar::InsertXXXButton() methods.
Allow inserting buttons into the ribbon bar and not only appending them.

Closes #13811.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:39 +00:00
Vadim Zeitlin
f01e56249a Allow using wxEVT_UPDATE_UI with wxRibbonButtonBar.
Generate wxUpdateUIEvent for the ribbon buttons to allow updating their state
using wxEVT_UPDATE_UI. Also update the same to show this.

Closes #12003.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:34 +00:00
Vadim Zeitlin
9df70d797b Don't send idle events to the windows about to be destroyed.
This is useless and can apparently result in some problems as of r25877 and
r25877 (from 8 years ago) added explicit checks preventing processing such
events in wxToolBar and wxMenu. Instead, simply don't generate these events in
the first place and also remove the now unnecessary checks for them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:31 +00:00
Vadim Zeitlin
a2fb9138b2 Better fix for wxSpinCtrlGeneric enabling/disabling bug in wxMSW.
To really ensure that the window containing the components of wxSpinCtrlGeneric
is never enabled under MSW (as we want to avoid this to ensure that any input
always goes to its children and not the window itself, see #12045), override
DoEnable() and not Enable(). This takes care of the case when the control gets
implicitly disabled because its parent is.

Closes #13142.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:27 +00:00
Vadim Zeitlin
be8fbbff66 Store row/column selection more appropriately in wxGrid.
Use wxGridSelection::m_rowSelection and m_colSelection for storing the
selected rows/columns respectively instead of storing them in m_blockXXX
arrays. This makes more sense and allows to easily implement the proper
handling of Ctrl-clicking in the row or column selection modes.

Closes #12638.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:23 +00:00
Vadim Zeitlin
144a67054a Mention wxEVT_COMMAND_TOGGLEBUTTON_CLICKED explicitly in the documentation.
Document the event type together with the event table macro.

See #11943.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:19 +00:00
Vadim Zeitlin
349f41fdbd Display help string for ribbon tools in a tool tip.
Show the help string of the ribbon item currently being hovered over in a
tooltip.

Closes #11879.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 22:05:15 +00:00
Stefan Neis
6dd0883d55 Do not put semicolons after the definition of an inline function.
Even though most compilers just ignore this, it's just wrong and if you
do get warnings about header files, they can become quite overwhelming.
Forward port of r70163.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 14:42:13 +00:00
Stefan Neis
d0a341b34a Include some more declarations & defines.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 14:36:22 +00:00
Stefan Neis
21317c46b4 Reordered "extern" and WXDLLIMPEXP_CORE specifiers; fixes #13816.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 11:26:05 +00:00
Vadim Zeitlin
bde56d09bb Restore wxEVT_MENU_CLOSE generation under Windows 95 after r70151.
WM_UNINITMENUPOPUP is "only" available since Windows 98/2000 so restore the
old code using WM_EXITMENULOOP as fall back, just to avoid any regressions for
people who might still be using these systems.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 17:47:21 +00:00
Vadim Zeitlin
abb8764e32 Compilation fix for VC6 after r70151.
VC6 standard SDK didn't define WM_UNINITMENUPOPUP, so define it for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 17:32:32 +00:00
Vadim Zeitlin
0d68cd1359 Add standard art providers at the bottom of the art providers stack.
This ensures that any user-defined art providers will be in front of them,
even when they are added at module-initialization time i.e. possibly before
the standard ones.

Closes #12519.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:29 +00:00
Vadim Zeitlin
91452726c2 Use best controller size in wxBookCtrl best size calculation.
Don't use GetControllerSize() which returns the actual, not the best, size of
the controller.

Closes #11793.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:25 +00:00
Vadim Zeitlin
d159e96495 Improve layout in the samples to avoid problems under Mac.
Changes the samples to look better under Mac and avoid the worst problems such
as overlapping buttons or truncated controls.

Closes #11651.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:21 +00:00
Vadim Zeitlin
7f3f059ac5 Complete wxEVT_MENU_{OPEN,CLOSE} implementation in wxMSW and wxOSX.
Set the wxMenu correctly for wxEVT_MENU_CLOSE events in wxMSW.

Set the menu id correctly to allow wxMenuEvent::IsPopup() to work for both
wxEVT_MENU_OPEN and wxEVT_MENU_CLOSE in wxOSX.

Closes #11313.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:17 +00:00
Vadim Zeitlin
c2cd367f7d Use memmove() instead of memcpy() in wxString::AssignCopy().
This at least allows the code like "s = s.c_str()" to work correctly when
using our own wxString implementation, even it doesn't fix all
self-assignment-related bugs (again, when using our own implementation only,
there is no bug when using std::basic_string as underlying implementation).

This is a cherry pick of r63008 from 2.8 branch.

See #11245.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:13 +00:00
Steve Lamerton
d296f9a114 Disable final failing wxWebView test. It fails on the buildbot but not locally.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 10:01:05 +00:00
Vadim Zeitlin
f79f06665c Compilation fix for PCH-less build after r70122.
Include the header declaring wxClientDC.

Closes #13809.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 17:32:29 +00:00
Vadim Zeitlin
1b47b78407 Compilation fix for wxUniv/X11 with wxUSE_STL==1.
Don't rely on implicit conversion from wxString to wchar_t*.

Closes #13790.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:50 +00:00
Vadim Zeitlin
59060c07b4 Update the value of read-only wxComboBox in wxUniv.
Fix regression in combobox appearance: it never showed the selected value when
it was read-only any more.

Closes #13688.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:46 +00:00
Vadim Zeitlin
7eff714407 Fix warning about non-virtual dtor in wxDataViewCtrlInternal.
This class doesn't need a virtual dtor but g++ warned about its absence
because it unnecessarily defined a virtual method. Just make this method
non-virtual to avoid the warning.

Closes #13395.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:43 +00:00
Vadim Zeitlin
6549dd3ce3 Suppress gcc -Wint-to-pointer-cast warnings in GTK wxDataViewCtrl.
Use wxUIntToPtr to avoid the warnings about casts from smaller (in 64 bit
build) int type to pointer.

Closes #13394.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:39 +00:00
Vadim Zeitlin
7716a165ef Don't use deprecated wxArtProvider::Insert().
Ironically, it was 2.6 compatibility code that was using the function
deprecated after 2.8. In any case, just use the newest name for it.

Closes #13393.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:36 +00:00
Vadim Zeitlin
e170515a9b Fix the size of the font returned by wxTextCtrl::GetStyle() in MSW.
CHARFORMAT stores height in 1/20th of a point, not pixels. Add the correct
conversion to the units used by LOGFONT.

See #13384.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:33 +00:00
Vadim Zeitlin
c7155388f5 Recognize background-color style in wxHtmlWindow.
Just treat it as a synonym for "background" i.e. the same as HTML3 BGCOLOR.

Closes #13173.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:29 +00:00
Vadim Zeitlin
3e65f74e18 Add support for more CSS styles to SPAN tag in wxHtmlWindow.
Add limited support font-family, font-style and text-decoration.

Closes #13170.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:26 +00:00
Vadim Zeitlin
d130167576 Increase the tolerance in wxStopWatch unit test.
Sleeping can take more time than expected when running on the build slaves,
probably because the machine is heavily loaded. Increase the tolerance to
prevent this from resulting in test failures.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-26 12:57:49 +00:00
Julian Smart
575be97600 Applied patch in #13777 (wxRichTextCtrl scroll and delete not refreshed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-25 17:04:51 +00:00
Vadim Zeitlin
51ec29ea5d Always link with expat in monolithic build.
Fix linking errors when using wxXML in sttaic monolithic build: in this case
we must link with expat but it was listed too early, before wxWidgets
libraries using it, in the bakefile-generated makefiles.

Now add it to the end of the linker command line too by including -lexpat in
EXTRALIBS_FOR_BASE which are appended to the linker arguments.

Notice that now -lexpat is linked twice because it is still added by
<wx-lib>xml</wx-lib> in bakefiles, even in monolithic build, but I don't know
how to avoid it and it is harmless anyhow.

Closes #12573.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-25 13:28:01 +00:00
Vadim Zeitlin
4d8e8355b4 Added a warning about multi-cells in wxGrid::DeleteRows() docs.
Currently deleting rows or columns intersecting a multi-cell is simply not
supported and results in an immediate crash.

See #4238.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-25 12:52:56 +00:00
Paul Cornett
0b3b8742c5 restore call to GetTabSize removed in r69880, it is needed to set x_extent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-25 00:57:27 +00:00
Vadim Zeitlin
4a04898fe0 Really fix the use of deprecated methods in wxGrid test.
The changes of r70111 were wrong, the unit test for wxGrid really did intend
to test the deprecated methods so restore them -- but only in
WXWIN_COMPATIBILITY_2_8 case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 18:30:52 +00:00
Vadim Zeitlin
864181f4f6 Implement wxNotebook::CalcSizeFromPage() for wxGTK.
The implementation is far from perfect as it relies on hard-coded margins but
is better than nothing as it allows wxNotebook best size determination and
SetPageSize() method to work correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 18:19:26 +00:00
Vadim Zeitlin
b73da1a41b Don't use deprecated methods in wxGrid test.
Don't use the methods defined only when building 2.8-compatible mode to let
the tests compile even with WXWIN_COMPATIBILITY_2_8 off. This only worked
before because of the wrong tests in grid.h but broke after the fixes of
r70098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 17:58:32 +00:00
Paul Cornett
2861be020e remove improper use of paste operator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 16:46:26 +00:00
Vadim Zeitlin
8c167bb199 Fix fatal bug with deleting the old contents in wxScopedArray::reset().
"delete" was wrongly used instead of "delete[]".

Closes #13806.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:14 +00:00
Vadim Zeitlin
7182483bf7 Use the correct function type cast in EVT_WEBKIT_NEW_WINDOW.
Use wxWebKitNewWindowEventHandler to perform a proper static_cast<>, which
detects incorrect casts during compilation, instead of
wxWebKitNewWindowEventFunction which was just doing an unsafe C-style cast.

Cloes #13805.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:12 +00:00
Vadim Zeitlin
70ef16f4e2 Add EVT_FSWATCHER event table macro.
It was documented, and ought to have existed anyhow for consistency with
wxEVT_FSWATCHER, but wasn't defined. Do it now.

Closes #13804.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:08 +00:00
Vadim Zeitlin
a601696dd5 Add EVT_WINDOW_MODAL_DIALOG_CLOSED() event table macro.
Add it for consistency with wxEVT_WINDOW_MODAL_DIALOG_CLOSED.

See #13804.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:05 +00:00
Vadim Zeitlin
b099835e8f Fix typo in wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK in documentation.
It was misspelt as wxEVT_COMMAND_RICHTEXT_DLEFT_CLICK.

Closes #13802.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:01 +00:00
Vadim Zeitlin
f179a616c7 Remove references to defunct event types in comments.
No real changes, just complete the changes of r58039 by removing the
references to non-existent (any more) event types from the comments too.

Closes #13801.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:42:57 +00:00
Julian Smart
c1431e59e3 Applied #13803: wxRichTextCtrl: missing event-table macro (dghart)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 11:39:40 +00:00
Steve Lamerton
8a31648287 Disable some wxWebView tests that fail on the buildbot but not locally.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 10:08:37 +00:00
Steve Lamerton
b8800bfe8b Fix typo in ADD_RAW_IID macro.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 10:05:31 +00:00
Steve Lamerton
ed1c9160bf Add some extra yields to wxWebView unit tests to hopefully fix some of the failing buildbot runs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-23 19:16:47 +00:00
Paul Cornett
620e83e412 don't use deprecated function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-23 17:38:30 +00:00
Paul Cornett
7bc57fd972 fix tests for WXWIN_COMPATIBILITY_2_8, closes #13800
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-23 05:59:59 +00:00
Steve Lamerton
9f194b9de0 Use OLE helper macros in wxWebView to reduce the amount of duplicated code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 19:16:12 +00:00
Steve Lamerton
4b4ed3c942 Add new ADD_RAW_IID OLE helper macro to allow use with classes that do not start with IID_I.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 19:14:58 +00:00
Steve Lamerton
d04002224e Mark various OLE helper functions as DLL exported so they can be used from other libraries.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 19:08:43 +00:00
Paul Cornett
6041f69ca7 remove SetBackgroundStyle call from OnInternalIdle, it should be done from realize handler, closes #13799
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 18:21:41 +00:00
Vadim Zeitlin
e718eb9840 Fix wxLogFormatter compilation under MSW.
Fix wxMSW compilation after the changes of r70086.

Closes #13792.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 16:36:47 +00:00
Vadim Zeitlin
b25278d885 Dramatically optimise inserting many items in wxGenericListCtrl.
During each item insertion SetItem() was called and this resulted in a call to
GetItemRect() which, in turn, re-laid out all items in the control meaning
that the relatively expensive wxListMainWindow::RecalculatePositions() was
called N times when inserting N items.

Reduce this to just a single call by not refreshing the item in SetItem() if
everything is going to be redrawn soon anyhow.

This decreases the time needed to insert a couple of thousands of items in
icon view from several minutes to less than a second.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 14:47:54 +00:00
Vadim Zeitlin
4ffdb64018 Add wxLogFormatter to allow easier wxLog output customization.
Delegate the log string creation to wxLogFormatter. This allows defining a
custom object of a class derived from it to customize the log output instead
of having to override DoLogRecord() in wxLog itself.

Closes #13792.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 13:35:01 +00:00
Robin Dunn
2cc6b51b90 Avoid a problem in Phoenix by making UpdateMacScrollWindow not be pure virtual.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 01:26:11 +00:00
Robin Dunn
bb6eb69414 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 01:25:18 +00:00
Stefan Csomor
034e7d7ccf rebaked Xcode proj for cocoa after date & timectrls were added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-21 16:27:43 +00:00
Vadim Zeitlin
08be21f56d Correct generic wxListCtrl display of items with icons in list mode.
The changes of r70066 improved the layout for icon and small icon modes but
broke it for the list mode if items had icons because the item width should
account for the icon as well in this case. Simply disable the code added in
this revision when in list mode, we don't need to do anything then anyhow as
the layout already worked correctly for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-21 13:56:50 +00:00
Vadim Zeitlin
7451b5c459 Guard against a possible crash in wxListCtrl::DeleteColumn().
We could crash when deleting a column after switching to report view from icon
view. As deleting a column works just fine under MSW in this case, make it
work in the generic version as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-21 13:56:47 +00:00
Vadim Zeitlin
54d323d299 Document wxListCtrl::InReportView() and IsVirtual().
These functions are more convenient than directly testing for styles and are
already used outside wxWidgets do make them officially part of the public API.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-21 13:07:18 +00:00
Vadim Zeitlin
921e411cc1 Ignore extra modify events after rename in wxFileSystemWatcher.
Document that such extra events may occur and generally improve the event
types documentation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-21 00:26:06 +00:00
Vadim Zeitlin
fceac6bbfe Provide native implementation of wx{Date,Time}PickerCtrl for wxOSX/Cocoa.
Use NSDatePicker to implement both of these controls. Almost all of
wxDatePickerCtrl styles are not supported in the native version but the basic
functionality does work and looks much better than the generic version (which
is still available as wxDatePickerCtrlGeneric if needed) under Mac.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 21:27:14 +00:00
Vadim Zeitlin
36d07f78e4 Added helpers for translating between wxDateTime and NSDate.
These functions will be used in the upcoming native implementations of
wxDatePickerCtrl and wxTimePickerCtrl but could also be reused elsewhere in
wxOSX/Cocoa, notably in wxDataViewCtrl where strange ad hoc code is currently
used.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 21:27:09 +00:00
Vadim Zeitlin
59a2c19914 Added wxTimePickerCtrl page to the widgets sample.
Even if this page is pretty trivial, add it for consistency with
wxDatePickerCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 21:27:06 +00:00
Vadim Zeitlin
54450d0907 Reorganized the date picker page of the widgets sample.
Make it possible to set the picker styles and set its range and not only the
current value.

Also log the events generated by it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 21:27:02 +00:00
Vadim Zeitlin
7a7e178339 Ukrainian translations update from Yuri Chornoivan.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 21:22:31 +00:00
Vadim Zeitlin
4d0c23087a Fix horizontal alignment in icon view in generic wxListCtrl.
Ensure that all the items in the same column have the same width, so that
their labels are centred.

Closes #9227.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 21:21:38 +00:00
Vadim Zeitlin
8573b14550 Brazilian Portuguese translations update from Felipe.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 17:42:04 +00:00
Vadim Zeitlin
00c784a4d1 Fix crash in wxRegion in wxOSX/Carbon.
Apparently some code expects to be able to call wxRegion::GetWXHRGN() even on
an invalid wxRegion. Return NULL in this case instead of crashing.

This fixes crash on startup of the widgets sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 15:39:42 +00:00
Vadim Zeitlin
0d2a693bbd Add support for webview library to MSW bakefile presets.
The webview library wasn't linked in correctly when using MSW bakefile
presets. Fix this by adding the corresponding <sys-lib> for it (this needs to
be done for MSW only, under Unix it's handled by wx-config).

Closes #13789.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 13:27:59 +00:00
Vadim Zeitlin
aa866feeaa Mention the dialog focus regression fix in wxMSW in the change log.
See #13765.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-20 13:24:48 +00:00
Robin Dunn
3d2ee2fb05 Interface tweaks and fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-19 22:39:02 +00:00
Bryan Petty
b821341a03 Added missing semi-colon in versioninfo.h interface header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-19 21:16:01 +00:00
Dimitri Schoolwerth
4235f9f6c6 Cleaned up some of the code in wxSlider::DoMoveWindow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-19 13:14:24 +00:00
Vadim Zeitlin
ee4d438064 Added support for wxEXEC_MAKE_GROUP_LEADER to wxExecute().
Map it to the native CREATE_NEW_PROCESS_GROUP flag as it's broadly similar to
Unix semantics.

Closes #13676.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-19 12:54:48 +00:00
Vadim Zeitlin
1c959a62ce Add possibility to set item background in generic wxDataViewCtrl.
Added wxDataViewItemAttr::SetBackgroundColour() and code to honour it in the
generic implementation of wxDataViewCtrl.

Closes #12621.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-19 12:54:38 +00:00
Vadim Zeitlin
02106526ea Don't use dummy "inline" in wxDEPRECATED_CONSTRUCTOR definition.
Apparently we need this bogus "inline" for g++ < 3.4 but there is no reason to
use it for the other compilers and this results in linking errors with e.g.
MSVC, so remove it.

Closes #13775.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-19 12:54:32 +00:00
Dimitri Schoolwerth
cac008ad62 Fixed min and max label values not being swapped when using wxSL_INVERSE in a horizontal MSW slider.
Changed wxSlider::GetLabelsSize to let the widthMin and widthMax values contain the width of what the minimum (always on the left/top) and maximum (always on the right/bottom) _label_ will contain. This is not the same as the minimum and maximum _value_ in case of using wxSL_INVERSE.

Also don't swap the position of the min/max labels in a horizontal slider with wxSL_INVERSE (just how the labels already stay in place in a vertical slider, regardless of wxSL_INVERSE usage), nor their width.

Regression since r65941.

Fixes #13416.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-19 12:28:42 +00:00
Dimitri Schoolwerth
2a263bbbd7 Removed useless if statement in slider code.
The y position of the slider is already taken care of by the variable ySlider, changing labelOffset has no use.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-19 12:16:52 +00:00
Dimitri Schoolwerth
e528cca7c1 Don't move the slider's value label if it's not being used.
An if statement was missing brackets and still moving the value label.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-19 12:12:31 +00:00
Vadim Zeitlin
9efbfd5dbd Add a reminder to update version.bkl to inc_release script.
While docs/tech/tn0011.txt does document this, it's still too simple to forget
to update version.bkl, as my experience shows, so add a reminder to the script
itself too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-18 14:38:47 +00:00
Vadim Zeitlin
08670ea85a Update version to 2.9.4 in version.bkl too and rebake everything.
Change the version for Unix shared libraries too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-18 14:35:50 +00:00
Vadim Zeitlin
75cb911c7c Added wxFilePickerCtrl::SetInitialDirectory().
This method allows to configure the initial directory to be shown when
browsing for files in an initially empty wxFileDirPickerCtrl.

It is also available for wxDirPickerCtrl but is less useful there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-18 12:34:47 +00:00
Vadim Zeitlin
b9bb74e9fc No changes, just use wxScopedPtr instead of explicit "delete".
Use wxScopedPtr in wxGenericFileDirButton to ensure that the dialog created by
it is always destroyed, even if an exception is thrown while showing the
dialog or while processing the event we generate after showing it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-18 12:27:04 +00:00
Steve Lamerton
7f98bdd6a5 Ensure wxWebViewIE::SetPage clears the existing content before writing the new output. Also add a basic unit test to verify correctness in the future.
Fixes #13770

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-18 11:51:52 +00:00
Vadim Zeitlin
913ce2990e Make wxPalette ctor and Create() const-correct in wxMSW.
The input data is never modified so should be const (it is also documented as
being const and actually is const in the other ports).

Closes #13776.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-17 23:52:47 +00:00
Vadim Zeitlin
05f5b3f745 Define wxBitmapComboBox::Insert(void* clientData) overload in wxMSW.
This overload was declared in the header but not implemented, do add its
definition too.

Closes #13774.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-17 23:52:43 +00:00
Vadim Zeitlin
ecc610f1af Corrected the name of EVT_WEB_VIEW_ERROR event table macro.
It was mistakenly spelt EVT_WEB_VIEW_ERRROR.

Closes #13772.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-17 23:52:40 +00:00
Vadim Zeitlin
65ea1c9dca No changes, just fix typo in an example in webview docs.
See #13772.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-17 23:52:36 +00:00
Vadim Zeitlin
7cb83a8b78 Don't activate MSW dialogs when setting their initial size.
As the dialog is not shown yet at this moment, activating it didn't work
correctly and the dialog didn't get the focus when it was shown later.
Fix this by preventing ::SetWindowPos() from activating it, which it does by
default.

Closes #13765.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-17 23:04:50 +00:00
Dimitri Schoolwerth
a57ea0102f Fixed unreferenced parameter warning.
Parameter xmpData was unused in wxImage::Create when compiling with wxUSE_XPM set to 0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-17 01:13:22 +00:00
Vadim Zeitlin
c05b000c71 Incremented the version number to 2.9.4 everywhere.
The misc/scripts/inc_release script was used to update the versions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-16 22:12:49 +00:00
Vadim Zeitlin
69b554dccc Try to get more information about wxFileSystemWatcher unit test failures.
Log the original and new paths of the rename event to help debugging the extra
modification events detected during the buildbot builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-16 21:11:19 +00:00
Vadim Zeitlin
bfbd873bfe Don't use wxTE_DONTWRAP style in Lines() wxTextCtrl unit case.
The last check in this test couldn't pass under MSW as it relied on the (long)
line of text being wrapped but the style used for the control prevented this
from happening. Not sure how could it have ever worked before but in any case
removing wxTE_DONTWRAP does make the test pass.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-16 19:57:17 +00:00
Vadim Zeitlin
b281a92305 Keep the item being updated selected in wxMSW wxChoice::SetString().
Changing the text of the selected wxChoice (or wxComboBox, as it derives from
it in wxMSW) item made it unselected. Fix this by explicitly restoring the
selection to the item if needed.

Closes #13769.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-16 19:47:58 +00:00
Vadim Zeitlin
5b130f274e Corrected test for region validity in wxMSW wxRegion::DoOffset().
Checking M_REGION is not enough as the region can be invalid (meaning
m_refData dereferenced inside M_REGION is NULL itself) and not just not
initialized, so it resulted in crashes and not just the expected assert
failure when wxRegion::Offset() was called for an invalid region.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-16 19:47:55 +00:00
Vadim Zeitlin
03dc350fa6 Use IsThisEnabled() to test if AUI child is enabled, not IsEnabled().
IsEnabled() returns false if the parent window is disabled and calling
Enable() does not help with this, so we could keep trying and trying to enable
the window unsuccessfully if it was reenabled while its parent was disabled,
resulting in a never-ending stream of EVT_IDLE events.

Closes #13767.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-16 19:33:31 +00:00
Vadim Zeitlin
35f92de300 Make multiline checkboxes wider in wxMSW to avoid word wrap.
At least for some versions of Windows (Server 2003 with classic look and feel)
the native checkboxes auto wrapped the label as it wrongly considered that the
width we specified for it was not big enough. Compensate for this by making
the checkbox wider -- this is just a hack but still better than corrupting the
checkbox display.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-16 11:03:15 +00:00
Vadim Zeitlin
a97f71fa60 Output the value of --enable-debug option in configure.
As we use AC_ARG_ENABLE() instead of WX_ARG_ENABLE() for it, we need to call
AC_MSG_RESULT() explicitly or its value is never reported and configure output
is corrupted.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-16 09:36:36 +00:00
Vadim Zeitlin
0c717dd16b Compilation fix for wxStopWatch with wxUSE_THREADS==0.
Use wxCRIT_SECT_DECLARE_MEMBER/wxCRIT_SECT_LOCKER macros which expand to
nothing in wxUSE_THREADS==0 case instead of using wxCriticalSection[Locker]
classes which are not defined then.

Also explicitly include wx/thread.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-15 21:13:03 +00:00
Julian Smart
5dec941a5b Applied #13763 from dghart, to use primary selections if available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-15 11:32:58 +00:00
Vadim Zeitlin
9edd688dd3 Ensure that wxPropertyGrid::m_tlp is initialized early enough.
This member variable could be used before it was initialized as
OnTLPChanging() was called from Create() before Init2(), where m_tlp was
assigned NULL, was called.

Closes #13552.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-15 00:22:48 +00:00
Vadim Zeitlin
81dd48085d No changes, just harmonized the EOLs in the ISS file.
Use consistent DOS EOLs for all the lines in this file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 18:42:11 +00:00
Václav Slavík
c9d3d00cdf Remove unnecessary m_editorCtrl assignment.
m_editorCtrl is WeakRef<>, so doing it is pointless, and it breaks VC6
compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 17:38:19 +00:00
Václav Slavík
a85b4023d1 Close wxDataViewCtrl inline editor when destroying the control.
If the wxDataViewCtrl control was destroyed while an inline editor
control was still active, it wouldn't get destroyed in the right order
and the ~wxWindow assert about unpopped event handlers would be
triggered.

Fix this by popping the handler as one of the first things in
wxDataViewRendererBase destructor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 16:00:30 +00:00
Václav Slavík
eff1c3e8ec Don't change horizontal scroll position needlessly in wxDataViewCtrl.
When ScrollTo() or EnsureVisible() was called in the generic
wxDataViewCtrl implementation with unspecified column, horizontal scroll
position was reset to left-most position, which doesn't make much sense.
Instead, leave horizontal position unchanged in this case and only
change it when explicitly requested.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 15:53:28 +00:00
Václav Slavík
78e18e8d53 Ensure that current column is visible in generic wxDataViewCtrl.
When navigating between columns using keyboard, ensure visibility of the
newly selected column.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 15:53:25 +00:00
Chris Elliott
ecd4526b30 2.9.3 version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 08:52:48 +00:00
Vadim Zeitlin
afe9b0559a Add the release date of 2.9.3 to the change log.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 00:46:12 +00:00
Vadim Zeitlin
fc672a2aba Use string column identifiers with NSTableColumns in wxDataViewCtrl.
Starting with OS X 10.7 the column identifiers used in NSOutlineView must be
of type NSString, so convert the code to use string identifiers instead of
wxPointerObject.

Closes #13661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-13 21:08:17 +00:00
Julian Smart
d86b82bb2c Applied #13738: Make a wxRichTextImage's box display around the image (dghart)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-13 19:06:53 +00:00
Dimitri Schoolwerth
9815c111d7 Regenerated Xcode projects.
Updated the Xcode projects to use timectrlg.cpp (renamed from timectrl.cpp).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 20:38:51 +00:00
Stefan Csomor
309f2b2031 adding defaults for Xcode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 15:54:40 +00:00
Stefan Csomor
3d909cc42f reverting r69387 and r69389, fixes #13737
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 15:43:33 +00:00
Vadim Zeitlin
c28a4e5fa5 Rename src/generic/timectrl.cpp to timectrlg.cpp.
We can't use the same names for these files with VC6, it doesn't support this
and the project can't be built because of the output object file names
conflict.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 14:01:23 +00:00
Vadim Zeitlin
d4cf50c8b2 Remove the item before notifying about it in wxDataViewIndexListModel.
Remove the item from the internal representation of the model before calling
ItemDeleted() callback so that the callback sees the model in a consistent
state.

This is more consistent with the other callbacks (e.g. ItemAdded()) and other
models (e.g. wxDataViewVirtualListModel) and should fix crashes in wxOSX
version of the control.

Closes #13753.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 13:08:46 +00:00
Vadim Zeitlin
46e9b34a60 Always give error message when file-related functions fail.
Some failures in the file functions that usually did give error messages were
not reported, do log these errors too now.

Closes #13576.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 13:08:43 +00:00
Vadim Zeitlin
b4bdde879b Fix harmless warning in wxOSX with 10.7 SDK.
Use NSInteger instead of int in a declaration to avoid warnings about
declaration mismatch from g++ 4.2 under OS X 10.7.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 23:59:33 +00:00
Vadim Zeitlin
1677253b36 Minor corrections to event handling overview documentation.
Use "wx" prefix with the macros and correct the event methods used in the
example.

Closes #13752.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 23:51:18 +00:00
Vadim Zeitlin
bf79972894 Document that setting colours for native controls might not work.
Changing colours of the native controls can't be relied on.

See #13745.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 23:51:14 +00:00
Paul Cornett
565ed8bfd8 fix GetTextExtent with non-null font argument, fixes #13750
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 19:05:24 +00:00
Vadim Zeitlin
4cf1a9bf4a Ensure that Enter key presses are never stolen from wxButton in wxMSW.
This commit fixes the following bug: when an in-place editor control containing
an embedded button was used in wxDataViewCtrl, pressing Enter on the button
would close the editor, accepting changes, instead as (generic) wxDataViewCtrl
intercepts WXK_RETURN in its EVT_CHAR_HOOK handler. To prevent this from
happening, wxButton now handles EVT_CHAR_HOOK itself and never lets the parent
window intercept it if it's for WXK_RETURN. To ensure that normal
wxEVT_KEY_DOWN and wxEVT_CHAR are still generated in this case, wxButton
handler calls the new wxKeyEvent::DoAllowNextEvent() method that was added to
allow suppressing EVT_CHAR_HOOK only, without affecting the subsequent events.
DoAllowNextEvent() is currently only used in wxMSW but support for it was also
added to wxGTK and (both) wxOSX ports.

See #9102.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 17:03:56 +00:00
Paul Cornett
91614f1aa3 don't include files which may not exist in source release for a specific platform, fixes #13746
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 05:36:52 +00:00
Vadim Zeitlin
a4a06df3b4 Document wxFileConfig ctor.
This ctor was not documented at all because the comment preceding it was a
plain C++ comment and not a Doxygen one.

Do it now, especially as the logic of this ctor is not quite obvious.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-10 11:42:49 +00:00
Robin Dunn
5eb16fe200 Use default values for some parameters of wxSizerItem and wxGBSizerItem ctors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-10 04:34:06 +00:00
Vadim Zeitlin
e6d7f1efce Quote variables in -z tests correctly in wx-config.
The changes of r69944 broke wx-config for the traditional Unix systems (at
least Solaris and AIX, probably others too) which don't support using -z
without any value (unlike Linux/bash).

Fix this by quoting the possible empty variables in the tests.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 21:41:36 +00:00
Vadim Zeitlin
ccc0835d02 Rename wxRichToolTipPopup::SetBackground() method to avoid warnings in wxUniv.
wxUniv has SetBackground() in wxWindow so rename this one to
SetBackgroundColours() to avoid g++ warning about hiding a base class virtual.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 15:58:40 +00:00
Stefan Csomor
9c17ca3fe6 avoid accepting an invalid color, ignore it, as other ports do, fixes #13720
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 15:23:37 +00:00
Vadim Zeitlin
25fe875df6 Restore mouse capturing/releasing in wxPopupTransientWindow under MSW.
Partially revert the changes of r69350 to restore EVT_IDLE handling of
wxPopupTransientWindow under MSW. It turns out that we must release the mouse
for the embedded controls to work.

It would be better to solve the problem differently, e.g. perhaps maybe only
releasing mouse capture when mouse is clicked as the current code is fragile
but for now at least restore the functionality that used to work.

Closes #13740.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 15:20:55 +00:00
Stefan Csomor
815acb8e5a fixing copy size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 11:09:00 +00:00
Vadim Zeitlin
4fe4a7c50f Add wxEXEC_HIDE_CONSOLE flag allowing to unconditionally do it under MSW.
Also renamed wxEXEC_NOHIDE to wxEXEC_SHOW_CONSOLE for symmetry (keeping the
old name for compatibility, of course).

Extend exec sample to allow easily testing the different flags and adding more
of them later.

See #13676.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 20:22:55 +00:00
Vadim Zeitlin
0266103273 Explicitly document wxEXEC_XXX flags.
These flags were described in wxExecute() documentation but not clearly
documented individually, do it now.

Also reduce duplication of documentation in different wxExecute() overloads.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 20:22:52 +00:00
Stefan Csomor
46447d1ae8 copied from old cocoa code from David, fixes #13732
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 17:08:10 +00:00
Vadim Zeitlin
7ef791557a Allow using wxEvtHandler::Bind() with IBM xlC compiler v7+.
xlC 7 seems to be able to deal with this code without problems under AIX 5.3
so white list it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 15:58:45 +00:00
Vadim Zeitlin
1863484b08 Use '1'..'9' to simulate digits instead of WXK_NUMPADn.
Using WXK_NUMPADn with wxUIActionSimulator doesn't work under Unix, the
resulting GDK events have wrong keyval for some reason.

It would, of course, be nice to fix this but in the meanwhile use ASCII codes
to simulate the digits to at least allow doing this at all.

Also extend uiaction sample to allow testing text simulation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 15:55:40 +00:00
Vadim Zeitlin
64c502e828 Refactor to eliminate duplication in wxGTK key events generation code.
This also fixes a small bug with wxKeyEvent::m_uniChar not being always set
correctly to the same value as m_keyCode for ASCII characters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 15:55:37 +00:00
Bryan Petty
20004800cf Regenerated new Doxygen custom HTML header, footer, and stylesheet with 1.7.6, but only for use with Doxygen 1.7.4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 15:45:41 +00:00
Vadim Zeitlin
079b6a775a Fix Unicode key code for Ctrl-letter in wxGTK.
This was broken by changes in r69892 and just the letter was used as the key
code instead of Ctrl-letter as it used (and should) be.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 14:54:25 +00:00
Vadim Zeitlin
4ce3452d32 Only declare wxComboBox::Popup/Dismiss() when using Cocoa in wxOSX.
wxOSX/Carbon doesn't use the core implementation file so declaring these
methods for the Carbon version resulted in linking errors. Just don't do this,
they're not implemented for Carbon anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 14:47:37 +00:00
Vadim Zeitlin
53943b06e4 Refresh generic wxListCtrl after removing a column from it.
Deleting a column still kept it on display, at least until the next refresh,
e.g. resizing the window was enough to make it disappear.

Simply add a call to Refresh() to ensure that the column does disappear when
deleted.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 14:15:55 +00:00
Vadim Zeitlin
5fafec4d9f Document that wxEraseEvent::GetDC() never returns NULL.
This makes implementation of EVT_ERASE_BACKGROUND handlers simpler.

Closes #13736.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 13:07:53 +00:00
Vadim Zeitlin
b0c7cd8ed5 Correct the name of EVT_DATAVIEW_ITEM_START_EDITING event type in the docs.
START_EDITING is not the same as EDITING_STARTED.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 13:04:11 +00:00
Vadim Zeitlin
09fbcf2a62 Fix asserts when removing the menu item starting radio group in wxOSX.
Update m_startRadioGroup when removing the item it corresponds to.

Closes #13545.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 00:07:12 +00:00
Vadim Zeitlin
0e50659242 Set the tooltip for generic wxToolBar tools under wxOSX/Cocoa.
When using non-native toolbar, set the tooltip for tools m_controlHandle.

Closes #12362.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:55:38 +00:00
Vadim Zeitlin
cf82560a38 Work around impossibility to use wxCombobox in wxGrid in wxOSX.
Open the combobox when the editor is initially shown, this somehow ensures
that the combobox selection is taken into account when it is closed while
without this the selection is simply completely ignored.

This is just a hack but at least it allows to use wxGridCellChoiceEditor under
wxOSX which was previously impossible at all.

Closes #12644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:41:14 +00:00
Vadim Zeitlin
f834239f59 Use NSApp abortModal instead of stopModal to end modal dialogs.
Using abortModal is apparently the right thing to do if the dialog is not
being closed as the result of user action (but e.g. because a timer expired)
and shouldn't change anything if it done because of something the user did
(e.g. clicked on a button).

Closes #12467.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:41:10 +00:00
Vadim Zeitlin
ff8cb900da Implement wxComboBox::Popup() and Dismiss() for wxOSX/Cocoa.
Unlike in the other ports, these methods currently don't generate any events
under OS X because these events are never generated at all there.

Closes #12642.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:41:06 +00:00
Vadim Zeitlin
f089d73634 Don't use gtk_menu_item_set_submenu() with NULL menu with GTK+ < 2.12.
In GTK+ 2.10 and earlier gtk_menu_item_remove_submenu() had to be used to
remove the items submenu as gtk_menu_item_set_submenu() gave errors when
passed NULL submenu, so call the old function when using old GTK+ version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:21:06 +00:00
Paul Cornett
ffaaf1078e In Refresh(), allow for possibility that child is mapped and parent is not.
It turns out this can actually happen, and is apparently allowed by GTK.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 19:34:57 +00:00
Vadim Zeitlin
e0e022b067 Order the libraries correctly in wx-config for static linking.
The order of libraries matters when linking statically under UNIX. Ensure that
it is always correct in wx-config itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 16:13:26 +00:00
Vadim Zeitlin
5e9d3bf799 Fix the size of the buffer when using wxIPC::Execute() with DDE.
Don't multiply the "realSize" variable by sizeof(wxChar) when passing it to
DdeClientTransaction(), as its name indicates it is already supposed to be the
size of the data and not the length of the string so just ensure that it is
always correctly set to the size and not length when initializing it.

Closes #13734.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 14:35:23 +00:00
Vadim Zeitlin
30e92ba333 Remove vertical wxTextCtrl adjustment hacks for wxMSW in wxComboCtrl code.
Because wxTextCtrl used to wrongly report its best size in wxNO_BORDER case
under MSW, wxComboCtrl manually adjusted its position to work around this.
However since r69066 wxTextCtrl::GetBestSize() was fixed and now these
adjustments resulted in wrong vertical position for the control.

Just remove all manual adjustments completely now to fix this.

Closes #13722.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 14:05:11 +00:00
Chris Elliott
9e0cad5d38 add dot to path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 12:48:17 +00:00
Vadim Zeitlin
2e8c12bcb0 Add documentation of emitted events to wxScrolled documentation.
Make it clear that wxScrolled<> emits wxScrollWinEvent and not wxScrollEvent.

Closes #13730.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 12:46:15 +00:00
Jouk Jansen
ee13a7e261 Update Make-files for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 07:47:29 +00:00
Vadim Zeitlin
55fb00a73a Pretend that the window showing popup menu has focus in wxGTK.
This is necessary for compatibility with wxMSW as the focus remains on the
window which had it before the popup menu was shown there and existing code
relies on it, while in wxGTK the popup steals the focus when it's shown.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 00:59:48 +00:00
Vadim Zeitlin
64652bee94 Enable wxEvtHandler::Bind() for Sun CC.
At least 5.10+ are good enough to compile it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 00:59:46 +00:00
Vadim Zeitlin
eef2e91ffb Fix build with Sun CC under Linux.
We need to explicitly define _GNU_SOURCE when building our code as we use it
configure when running the tests and it's not predefined by Sun CC, unlike g++
so we need to add it to CXXFLAGS ourselves.

An alternative solution would be to run the tests without _GNU_SOURCE but this
would lose too much functionality so it doesn't seem like a good idea.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 00:59:43 +00:00
Vadim Zeitlin
be1c88bf3e Remove wxHAVE_GLIBC2 from configure, always predefine _GNU_SOURCE.
We used to test for glibc version first and predefined _GNU_SOURCE only if it
was greater than 2.1 but there doesn't seem to be any harm to just always
predefine _GNU_SOURCE under Linux (not that there are any systems with glibc <
2.1 left anyhow). Also do it much earlier to ensure that all tests are
affected by it.

And as we don't use wxHAVE_GLIBC2 anywhere else just remove it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 00:59:40 +00:00
Stefan Csomor
f825123271 avoiding NSToolbarSeparatorItemIdentifier under Lion, where it is not supported anymore, fixes #13363
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-06 18:35:49 +00:00
Julian Smart
83c6ae8e25 Applied patch #13698 to fix wrong border test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-05 09:59:51 +00:00
Chris Elliott
dc1c249471 add docs to name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-05 09:00:23 +00:00
Vadim Zeitlin
bab2519980 No changes, just remove unnecessary assignment in wxOSX code.
Local size variable was unnecessarily assigned itself.

Closes #13723.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-05 00:00:58 +00:00
Vadim Zeitlin
ecb35373ee Add virtual dtor to wxCustomBackgroundWindowBase.
Suppress g++ warnings about a class with virtual methods but non-virtual dtor
by making the dtor virtual even if we don't need it to be virtual in this
class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-04 23:57:36 +00:00
Vadim Zeitlin
1f92048725 Compilation fix for wxCarbon after the last commit.
Apply corrected version of the patch for Carbon.

See #13661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-04 23:57:32 +00:00
Vadim Zeitlin
f0e867e97c Fix wxDataViewCtrl compilation with 10.7 SDK under OS X.
Add the required casts to wxPointerObject.

Closes #13661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-04 19:23:42 +00:00
Vadim Zeitlin
b54a0e3913 Do not declare "environ" variable ourselves under MSW.
The changes of r69564 making "environ" declaration unconditional broke
MinGW 4.6 build, presumably because "environ" is declared differently (as DLL
exported?) there, so avoid declaring it under MSW, we don't need to do it
there anyhow as it's always defined in system headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-04 12:26:24 +00:00
Vadim Zeitlin
f27f9577ca Allow 2-step creation of wxGenericProgressDialog.
Add default ctor and Create() with the same parameters as the non-default
ctor.

Closes #13555.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-03 23:52:39 +00:00
Vadim Zeitlin
45d366f961 Don't include version in the URL created by wxMSW installer.
The link is the same for all version so don't version it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-03 23:52:36 +00:00
Vadim Zeitlin
4cdb79dce8 Don't require admin privileges in the MSW installer.
We don't need any extra privileges so avoid the elevation prompt under Windows
Vista and later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-03 23:52:33 +00:00
Vadim Zeitlin
c4073f2ce9 Generate makefiles for treelist sample when using configure.
treelist sample was never added to SAMPLES_SUBDIRS.

Closes #13718.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-03 00:34:24 +00:00
Vadim Zeitlin
17d72a48ff Fix bug with wxStopWatch::Start() not resuming paused stopwatch any more.
Since r69835 the stop watch remained paused even when Start() was called. Do
resume it when restarting it both for backwards compatibility and because it
makes more sense and also document this behaviour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-03 00:34:00 +00:00
Dimitri Schoolwerth
238188550e Updated out of date versions and release dates.
Mentioned more files in tn0011.txt that need version updating, and made it more clear which ones need to be changed manually. Modified inc_release to update docs/readme.txt and changed the version references in the readme.txt to 2.9.3. Also changed two references to the month of release from July to December.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 23:44:22 +00:00
Chris Elliott
996785e06a rc1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 17:06:32 +00:00
Stefan Csomor
ee8bc1a8f5 fixing build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 13:25:16 +00:00
Vadim Zeitlin
7920b94beb Link to wxGridCellFloatFormat when it's mentioned in the documentation.
Enum names are not auto-linked by Doxygen so prefix this enum with "::" to
force link creation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 12:42:35 +00:00
Vadim Zeitlin
4c2b10acad Rebake after webview-related changes in common.bkl.
Forgot to rebake all files (and not just library ones) after changes of
r69589.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 12:04:51 +00:00
Vadim Zeitlin
c9a828e77f Compilation fixes for wxMSW in wxUSE_STL=1 build.
Add explicit conversions from wxString to wchar_t* as they don't happen
implicitly when wxUSE_STL=1.

Closes #13715.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 12:04:46 +00:00
Vadim Zeitlin
7daecf9e6a Handle OpenBSD in wxDialUpManager code.
Closes #13716.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 12:04:42 +00:00
Dimitri Schoolwerth
ecc3b88b05 set svn:eol-style to CRLF on MSVC project files for wxWebView
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 10:34:46 +00:00
Dimitri Schoolwerth
3037427243 Fixed x64 application termination after exceptions in a file dialog callback.
Since Windows 7 exceptions thrown in a file dialog callback (possibly by third-party utilities) aren't swallowed anymore. Make use of SetProcessUserModeExceptionPolicy (available in Windows 7 SP1) to temporarily restore the old behaviour and prevent the crashing (or summoning of the Program Compatibility Assistant) of an x64 application.

Closes #13674.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 10:15:16 +00:00
Stefan Csomor
44d39160f5 adapting Xcode projects for r69898
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 07:40:45 +00:00
Robin Dunn
04992872e5 Removed const from a couple methods that are not const in the real code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 01:01:12 +00:00
Vadim Zeitlin
00405b6c68 Rename src/generic/richtooltip.cpp to src/generic/richtooltipg.cpp.
This avoids object file name conflict with src/msw/richtooltip.cpp when using
VC6.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:56:44 +00:00
Vadim Zeitlin
64ac3db840 Update all controls using in-place editors to handle Escape/Return correctly.
Define EVT_CHAR_HOOK handlers to ensure that pressing Escape/Return while an
in-place edit control is active affects only it and is not used for the
keyboard navigation.

Closes #9102.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:41 +00:00
Vadim Zeitlin
4d7bc8e761 Fix reentrancy in wxDataViewRendererBase::FinishEditing().
Switching focus to the main wxDataViewCtrl window resulted in focus loss event
and a reentrant call to FinishEditing() itself if it wasn't called because the
in-place edit control was being destroyed the first time.

Fix this by destroying the in-place control first and adjusting the focus
later, the effect should be exactly the same but now FinishEditing() can be
safely called from anywhere in the code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:35 +00:00
Vadim Zeitlin
4e4841b0ba No changes, just move wxTreeCtrlBase ctor to the source file.
Move inline ctor out of line to prepare for changing it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:33 +00:00
Vadim Zeitlin
9d79c17697 Don't use ListView_CancelEditLabel() as it doesn't work as expected.
ListView_CancelEditLabel() doesn't revert the controls value to the original
text as expected, so don't use it and revert to sending VK_ESCAPE to the
in-place edit control instead under all versions of Windows.

See #7663.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:29 +00:00
Vadim Zeitlin
3a95f73c00 Make wxEVT_CHAR_HOOK propagate upwards and send it to the window itself.
Send wxEVT_CHAR_HOOK events to the focused window itself but make them
propagatable to ensure that the parent windows (including the top level
parent) still get it. This still allows the TLW parent to intercept keyboard
handling in its child but allows the child (or an intermediate parent window)
to have some say in the matter.

See #9102.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:25 +00:00
Vadim Zeitlin
f47a359113 Make wxEVT_CHAR_HOOK behave in wxGTK as in wxMSW.
Send wxEVT_CHAR_HOOK before wxEVT_KEY_DOWN and avoid generating both
wxEVT_KEY_DOWN and wxEVT_CHAR if the hook event was handled.

This makes wxGTK behave consistently with wxMSW and wxOSX/Cocoa as can be seen
in the keyboard sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:22 +00:00
Vadim Zeitlin
e45d90901d Added wxKeyEvent ctor for creating event of the different type for same key.
This is useful for implementation code in a couple of ports so provide a
higher level ctor doing this instead of having to use a copy ctor and then
manually changing the event type.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:19 +00:00
Vadim Zeitlin
dfc7216da7 Refactor wxKeyEvent copying code.
Avoid duplication between copy ctor and assignment operator.

Also extract the assignment of everything not including the event type in a
reusable function as this can be useful for key event generation code in wxGTK
and possibly other ports.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:16 +00:00
Vadim Zeitlin
edf5822ace Implement EVT_CHAR_HOOK for wxOSX/Cocoa.
Send wxEVT_CHAR_HOOK event from wxOSX/Cocoa code.

Also test for wxEVT_CHAR_HOOK in the keyboard sample and show the effect of
not skipping it.

Closes #12431.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:12 +00:00
Vadim Zeitlin
8270459a11 No changes, just remove unnecessary #pragma warning.
The warning we disabled occurred in the code that was removed long time ago so
it's not necessary to do it any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-02 00:50:09 +00:00
Stefan Csomor
b54a793bad applying patch for raise and synthesizing mouse-up for built-in controls, fixes #12363
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 18:36:58 +00:00
Paul Cornett
71929371c2 fix warning about missing return statement, closes #13713
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 16:54:21 +00:00
Vadim Zeitlin
b450f37eba Only use __declspec(restrict) with VC8+ in libpng.
VC7 doesn't support it.

Closes #13710.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 14:22:20 +00:00
Vadim Zeitlin
b9697cb410 Added wxCriticalSection::TryEnter() method.
This is similar to wxMutex::TryLock() and useful for the same reasons.

Closes #13638.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 14:22:15 +00:00
Vadim Zeitlin
4c5d5d633d Chinese translations update from Huang Jiawei.
Fix more fuzzy translations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 14:22:11 +00:00
Vadim Zeitlin
e60defcb94 Fix timeout used in POSIX implementation of wxCondition::WaitTimeout().
The time passed to pthread_cond_timedwait() must be in UTC, not local time,
but wxGetLocalTimeMillis() now really returns the time in local time zone so
we must use wxGetUTCTimeMillis() instead.

Closes #13707.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 14:22:07 +00:00
Paul Cornett
36307fdf51 remove unused variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 08:16:42 +00:00
Paul Cornett
612633432a add test for bug fixed in r69878
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 08:08:24 +00:00
Paul Cornett
0f29501b66 Fix crash when appending menuitem after removing it from another menu.
Also remove unused return value from GtkAppend

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 06:57:44 +00:00
Vadim Zeitlin
516ed23a94 Fix setting the parent of wxProgressDialog.
Don't call GetParentForModalDialog() with wxProgressDialog style, this doesn't
work as it expects the window style.

Do call SetParent() when using the native MSW implementation as the wx-level
parent is not used then.

Closes #13706.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 10:48:05 +00:00
Vadim Zeitlin
37bea8d229 Don't include all wx/xxx/webviewhistoryitem_xxx.h headers.
Only one of these headers is available for each platform so include at most
one of them.

Closes #13705.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 10:21:43 +00:00
Vadim Zeitlin
99644bf127 Include wx/defs.h, not wx/setup.h from wx/webview.h for consistency.
All wx headers start by including wx/defs.h so do it in wx/webview.h as well
even if wx/setup.h was sufficient in this particular case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 10:21:40 +00:00
Vadim Zeitlin
a3d73e4c09 Document more wxCommandProcessor methods.
Document CanRedo(), Store() and GetCurrentCommand().

Closes #13700.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 09:21:37 +00:00
Vadim Zeitlin
2f0bebe646 Use more clear names for variables in wxHtmlSelection code.
Call the variables and related methods "character position" instead of
"private position" which wasn't very clear.

Closes #13307.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 09:21:33 +00:00
Vadim Zeitlin
35ce2b44b5 Remove unused variable from wxWebViewWebKit code in wxGTK.
g++ correctly warned about a variable being set but never used, just remove
it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 09:16:48 +00:00
Vadim Zeitlin
f0776dc43f Fix wxWebView compilation in STL build with wxGTK.
Convert wxString to GTK+ strings explicitly, implicit conversion doesn't
happen in STL build and may be wrong anyhow as it doesn't necessarily convert
the strings to UTF-8 expected by GTK+.

Closes #13703.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 09:16:44 +00:00
Vadim Zeitlin
d9fc8e993a Make wxMSW status bar slightly less tall by default.
The status bar in wxMSW applications was too big under Windows 7 because it
used EDIT_HEIGHT_FROM_CHAR_HEIGHT() to calculate the height which was simply
unwarranted here. Instead, make the status bar tall enough to accommodate
simple text contents by default and fix SetMinHeight() to actually work for
the cases when a taller toolbar is needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 00:52:34 +00:00
Vadim Zeitlin
f1a6c1d024 Don't include pbt.h from wxMSW code unnecessarily.
The contents of this header is available from winuser.h (included by
windows.h) since at least 15 years and pbt.h itself is not included in the
latest Platform SDK releases (8+) so simply don't include it and also don't
test for its availability in configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-29 19:27:14 +00:00
Steve Lamerton
8a4e043aef Override MSWTranslateMessage for wxActiveXContainer. Calling IOleInPlaceActiveObject::TranslateAccelerator ensures that accelerators and other keyboard functionality behaves correctly.
Fixes #13679.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 20:19:16 +00:00
Vadim Zeitlin
6c5cc8a075 Override GetMainWindowOfCompositeControl() in wxGrid subwindows.
This is necessary for HasFocus() to work correctly for them since the changes
of r69788.

Closes #13686.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 19:15:59 +00:00
Vadim Zeitlin
202388d3bc Correct HasFocus() to work with subwindows of a composite control.
When a subwindow (i.e. one that overrides GetMainWindowOfCompositeControl() to
return a parent window) has focus, HasFocus() should return true for it too,
in addition to returning true for the main window.

This completes the fix of r69788.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 19:15:57 +00:00
Vadim Zeitlin
4e2b91bb27 Extend wxBannerWindow background bitmap if necessary.
Ensure that the entire banner window uses the same background colour as the
bitmap, even when the bitmap is too small for the window size. This allows to
avoid using huge bitmaps if extending the bitmap with solid colour looks good
enough.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 18:58:52 +00:00
Vadim Zeitlin
e78e77e5ca Added instructions about building applications using wxMSW.
Explaining how to build wxWidgets itself is insufficient as usually people
want to actually build their programs using it and not just the library
itself, so add a section explaining how to build the projects using wxMSW.

Also add a table of contents and mention that MSVC and g++ are the main
supported compilers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 14:16:03 +00:00
Vadim Zeitlin
836499118f Ignore WXK_NONE events in wxStyledTextCtrl.
Scintilla use of 0 indicating "modifier key" conflicts with our use of
WXK_NONE indicating absence of a valid key code. As Scintilla can't do
anything with the keys without a key code anyhow, simply ignore them
immediately, without passing them to Scintilla, in DoKeyDown().

This fixes handling of IME input in wxStyledTextCtrl under MSW and possibly
other problems (e.g. with dead char keys).

Closes #13570.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 13:34:16 +00:00
Vadim Zeitlin
1d8d3cc5a1 Add support for custom numeric formats to wxGrid.
Allow %e and %g formats (as well as their upper-letter equivalents) in
addition to the default %f format for number display in wxGrid.

Closes #13583.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 13:23:33 +00:00
Vadim Zeitlin
09c0ebcf96 Don't hardcode the number of toolbar tools in the toolbar sample.
Use GetToolsCount() instead of the hardcoded 10 (which can be wrong if any
tools were added or removed).

See #13673.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 12:47:26 +00:00
Vadim Zeitlin
c66c8042ad Corrected handling of wxTB_HORZ_TEXT in the toolbar sample.
The value of flag could be lost when toolbar was recreated without using text
at all.

Closes #13572.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 12:47:23 +00:00
Stefan Csomor
1165fdbbe2 supporting rawctrl strings, fixes #13496, rawctrl is correctly interpreted for all platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 10:24:13 +00:00
Dimitri Schoolwerth
798ada3dc8 Regenerated Xcode projects.
Updated the Xcode projects to include src/common/time.cpp.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 06:02:52 +00:00
Paul Cornett
8f81f01db3 update _GOptionGroup check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 05:11:27 +00:00
Paul Cornett
514b0e137e build fixes for Universal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 05:00:09 +00:00
Paul Cornett
f423075391 don't warn about gnomeprint if we already have gtkprint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 04:51:51 +00:00
Paul Cornett
3fb71b017d don't require gconf-2.0, we don't use it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 22:59:26 +00:00
Vadim Zeitlin
2abc54ca70 Include wx/time.h to get wxLocaltime_r() declaration, not wx/datetime.h.
Also remove wxUSE_DATETIME guard, wxLocaltime_r() is available even without
wxUSE_DATETIME.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 20:28:45 +00:00
Vadim Zeitlin
fb7ce3e8cc No changes, just moved wxLocaltime_r() and wxGmtime_r() to wx/time.h.
These functions are used by wxGetTimeZone() defined in time.cpp and so need to
be available from wx/time.h. This is also the most logical place for them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 20:28:43 +00:00
Vadim Zeitlin
603c73dbba Implement wxStackWalker for wxMSW under x86-64.
Use 64 bit debug help functions instead of 32 bit ones and add code for
dealing with x86-64 stack frames.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:52:13 +00:00
Vadim Zeitlin
fc4070fc9d Add support for VK_OEM_102 key under wxMSW.
This is the "<>|" key on German keyboard and is also used in many other
layouts so failing to handle it resulted in not receiving EVT_KEY_XXX events
for these keys in wxWidgets programs.

Closes #13558.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:53 +00:00
Vadim Zeitlin
b4c0df15e0 Set Unicode key code correctly for key events for WXK_RETURN in wxMSW.
WXK_RETURN is an ASCII character so return it from wxKeyEvent::GetUnicodeKey()
for EVT_KEY_{DOWN,UP} events, especially as it was already done for EVT_CHAR
ones.

See #13558.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:49 +00:00
Vadim Zeitlin
e65ae1d36d Change value of wxHELP to avoid clash with wxSTAY_ON_TOP.
Using wxSTAY_ON_TOP with wxMessageDialog resulted in "Help" button appearing
since r68537 because these two constants had the same numeric value.

Avoid this by changing wxHELP value to be the same as wxCLOSE_BOX instead: the
latter can't be used with wxMessageDialog so this should solve the problem,
even if there are still conflicts. Also adjust the other button constants
values to account for wxHELP change.

Closes #13433.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:45 +00:00
Vadim Zeitlin
796e54ef37 Use wxGetUTCTimeUSec() in wxStopWatch under Unix for higher precision.
If gettimeofday() is available we can achieve better than millisecond
precision (even if it usually isn't as high as microsecond), so use it as
clock source in wxStopWatch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:42 +00:00
Vadim Zeitlin
e16458826d Use wxGetUTCTimeMillis() instead of wxGetLocalTimeMillis() in wxStopWatch.
Using local time meant that wxStopWatch didn't work reliably around DST
changes. It also was completely unnecessary, just use the UTC clock instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:35 +00:00
Vadim Zeitlin
cec1b1ab0b Removed private wxGetLocalTimeUsec() function from Unix code.
The function was badly named as it returned UTC time and not local time and
can be simply replaced with the just added public wxGetUTCTimeUSec().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:33 +00:00
Vadim Zeitlin
173a5ddc77 No changes, just move time functions from wx/stopwatch.h to wx/time.h.
Preserve compatibility by including wx/time.h from wx/stopwatch.h but put all
the time-related functions in a more logical place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:27 +00:00
Vadim Zeitlin
a43503cb8d Added wxGetUTCTimeMillis() and wxGetUTCTimeUSec().
Fixed wxGetLocalTimeMillis() to really return the local time and provide
wxGetUTCTimeMillis() doing what this function used to do before. Closes #13610.

Also add wxGetUTCTimeUSec() for even higher resolution time stamps as it is
basically the same as wxGetUTCTimeMillis() anyhow, at least for MSW and
non-ancient Unix systems providing gettimeofday().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:23 +00:00
Vadim Zeitlin
59068d79f7 Extracted private GetTimeZone() to public wxGetTimeZone() function.
Created new wx/time.h header for this function, more time-related functions
will be added to it later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:19 +00:00
Vadim Zeitlin
b0ec002323 Added wxStopWatch::TimeInMicro() for better precision time measurement.
Also simplify/streamline wxStopWatch implementation and replace confusingly
named m_pause with more clear m_elapsedBeforePause.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:12 +00:00
Vadim Zeitlin
54647bb750 Use ::QueryPerformanceCounter() for wxStopWatch implementation in wxMSW.
QueryPerformanceCounter() provides higher resolution and precision for
measuring time under MSW, even though it suffers from some problems in older
Windows versions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:08 +00:00
Vadim Zeitlin
c439998525 Use shorter sleep times in wxStopWatch unit test.
Make wxStopWatchTestCase::Misc() run in 2.5 seconds instead of 7. This not
only makes the test run faster but allows us to test wxMilliSleep() and
precision of wxStopWatch for time periods in fractional seconds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:05 +00:00
Vadim Zeitlin
e76e89aabe Correct wxTLS_PTR definition for !wxHAS_COMPILER_TLS case.
wxTLS_PTR should have type of "T*" instead of being simply usable as "T*"
because of its overloaded operator->(), otherwise the code relying on it being
"T*" and compiling without problems in wxHAS_COMPILER_TLS case could fail to
compile without compiler TLS support.

Closes #13644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:01 +00:00
Vadim Zeitlin
2d5779d440 Don't hide/show wxActiveXContainer when resizing it.
This results in bad flicker as can be seen with wxWebView or wxMediaCtrl and
just doesn't seem to be necessary.

Closes #13680.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:58 +00:00
Vadim Zeitlin
b29bd6b44f Don't crash when changing label of label-less wxToggleButton in wxGTK.
If a button doesn't show any text label, simply don't do anything when
SetLabel() is called instead of replacing the image shown by the button with a
text label as the button doesn't expect this to happen and doing it breaks its
assumptions about the widgets it has and results in assert failures later.

Closes #13693.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:54 +00:00
Vadim Zeitlin
d8991cbffe Include webview library headers in the list of all headers.
Due to a typo in files.bkl (${...} was used instead of $(...) so the variable
didn't get really dereferenced), the web view headers were not included in the
list of all headers and hence not installed by "make install" under Unix.

Closes #13690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:48 +00:00
Vadim Zeitlin
b82f92a80c Merge similar but not quite identical translated strings.
Some translated strings appeared several times in almost but not quite
identical form. Remove a few of them so that they don't have to be translated
multiple times.

Closes #13637.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:43 +00:00
Vadim Zeitlin
167d0cb30b Define wxCURSOR_DEFAULT_TYPE correctly for the old Cocoa port.
Closes #13652.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:33 +00:00
Dimitri Schoolwerth
9c0d9ce328 merged libpng 1.5.6 to trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 22:25:11 +00:00
Václav Slavík
0fdeaabe4d Account for indentation in wxDataViewCtrl::GetBestColumnWidth().
Generic control only accounted for actual content, but didn't consider
indentation level when calculating width of the expander column.

Fixes #13629.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 18:11:16 +00:00
Stefan Csomor
65c01ad0d4 fixing iPhone build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 14:37:03 +00:00
Paul Cornett
701871dc87 check for self-assignment in operator=
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 01:01:26 +00:00
Paul Cornett
ababdf5ffd copy array with memcpy rather than a loop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 00:59:45 +00:00
Paul Cornett
46a1983ae4 use int instead of size_t for a couple member variables
it's simpler, and there is no point in using size_t anyway since they are assigned from ints

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 00:52:24 +00:00
Paul Cornett
6cdab3b498 IsNull --> IsEmpty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 00:32:27 +00:00
Dimitri Schoolwerth
93b15d6145 Regenerated Xcode projects.
Updated the Xcode projects to include wxRichToolTip files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-24 22:21:59 +00:00
Robin Dunn
ed3aceb08c OnSysRead is pure virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-24 01:38:08 +00:00
Robin Dunn
11e5ed4f1b The wxStreamProtocolType enum is multiply defined, remove one of them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-24 01:37:45 +00:00
Vadim Zeitlin
35ee173d0f Fix crash in wxTreeListCtrl::GetItemText() if text was never set.
Asking for the text of an item is not an error even if it was never set for
any column but the first one so just return an empty string in this case
instead of crashing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-23 23:58:54 +00:00
Paul Cornett
0f31a78f36 remove redundant GTK-specific code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-23 17:21:06 +00:00
Vadim Zeitlin
815f65bd0f Italian translation corrections from Roberto Boriotti.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-23 15:06:42 +00:00
Václav Slavík
a2a4e18c10 Make generic wxDataViewCtrl rows a bit taller.
They now use the same height that Windows 7's Explorer uses. This makes
more inline editor controls fit comfortably.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-23 13:43:04 +00:00
Vadim Zeitlin
5f4994df03 Added convenient wxCmdLineParser::AddLong{Option,Switch}() wrappers.
The new functions simply call Add{Option,Switch}() with an empty first
argument but using them makes the code more readable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 13:18:58 +00:00
Vadim Zeitlin
6e043ba946 Dismiss wxSplashScreen on any user input, not necessarily on splash itself.
Use wxEventFilter to remove the splash screen as soon as any user input is
detected anywhere in the application, not necessarily over the splash screen
itself.

This ensures that the splash screen disappears as soon as the user starts
working with the application instead of sticking around and covering the main
window.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 13:18:55 +00:00
Vadim Zeitlin
7650eed409 Ensure that wxSplashScreen doesn't appear on taskbar nor in Alt-TAB list.
Having the splash screen in Alt-TAB window list under MSW was useless and ugly
(as it didn't even have the proper application icon) so use the appropriate
styles to avoid this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 13:18:53 +00:00
Vadim Zeitlin
58cc15871d Add wxEventFilter and related functionality.
Allow defining event filters to globally pre-process all application events
without having to override wxApp::FilterEvent().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 13:18:50 +00:00
Vadim Zeitlin
feb32e3165 Hack wxMSW wxNotebook to show the text controls correctly initially.
Add an Update() call to ensure that text controls in the initially selected
notebook page are shown correctly. It's almost certainly not the right fix for
the real bug that results in text controls not being shown when the notebook
comes up but it doesn't cost much and at least allows us to get correct
appearance for the themed notebooks.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 13:18:45 +00:00
Stefan Csomor
b0162e3274 fixes #13684
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 07:41:17 +00:00
Vadim Zeitlin
05df54d745 Italian translation update from Stefano and Roberto Boriotti.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-19 17:35:56 +00:00
Vadim Zeitlin
27b31266ea Czech translations update from Zbyněk Schwarz.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-19 00:00:24 +00:00
Vadim Zeitlin
ec90f7158e Fix HasFocus() for composite controls.
Comparing the result of DoFindFocus() with the main window of composite
control doesn't work as it can return a child window so HasFocus() still
returned false for a composite control such as generic wxListCtrl even when it
did have focus.

Just use FindFocus() instead of DoFindFocus() to fix this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-18 23:40:53 +00:00
Vadim Zeitlin
60eabdbebf No changes, just remove extra whitespace from wxWebViewIE code.
Closes #13678.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-18 23:40:24 +00:00
Steve Lamerton
40fab879f0 Remove double buffering from wxWebViewIE as this is handled by the web browser control itself and actually makes flickering worse. Also remove an unnecessary background style.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 20:43:34 +00:00
Steve Lamerton
1ce077e25b Adjust testing for non-visible controls in wxActiveXContainer.
Fixes  #13659

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 20:39:44 +00:00
Vadim Zeitlin
97aa7b9955 Provide HANDLE_PTR for the compilers without it such as VC6.
Also include wx/msw/wrapwin.h defininig HANDLE_PTR from wx/msw/webview_ie.h
that uses it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 16:43:34 +00:00
Jouk Jansen
7a3c45f2c8 define Popup and Dismiss for wxComboBox in wxMOTIF
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 07:51:04 +00:00
Robin Dunn
6f9921e15a fix missing and broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 03:20:25 +00:00
Robin Dunn
cce10ca06b Add arg default values for the Create method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 01:25:56 +00:00
Robin Dunn
a0ff361188 Don't include webkit headers from wx headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 01:23:03 +00:00
Vadim Zeitlin
f559d1a23c Move wxWebView-related definitions to webview_ie.cpp and fix them.
Ensure that all the GUIDs are defined by including initguid.h to fix linking
error with most versions of MinGW.

Use "wx" prefix to avoid clashes with the standard GUIDs if they do happen to
be defined.

Closes #13645.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-16 23:45:22 +00:00
Vadim Zeitlin
e901c81336 Another Chinese translations update from Jiawei Huang.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-16 18:38:02 +00:00
Vadim Zeitlin
8ea82c09ff Compilation fix for PCH-less build after r69758.
Need to include wx/msw/private.h explicitly for wxGetCursorPosMSW()
declaration now.

Closes #13664 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-16 18:27:48 +00:00
Vadim Zeitlin
c0c9009c8d Add support for digits and +/- sign to wxUIActionSimulator::Text().
Support the characters needed for number entry in wxUIActionSimulator::Text()
too.

Closes #13671.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-15 15:56:55 +00:00
Vadim Zeitlin
a496a72d66 Only update status bar fields after they were created in wxMSW.
Postpone updating statu bar panes after they were actually created.

Setting the status bar fields contents before setting the number of them
failed resulting in debug error messages and the text not appearing in the
status bar.

Closes #13670.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-15 15:46:01 +00:00
Vadim Zeitlin
31fb3cfe02 Replace wxT() with wxS() in image options definitions.
The optimal way of creating a literal strings consisting of only ASCII
characters is to use wxS() as this avoids the need for run-time conversion in
all builds while wxT() requires a conversion from wchar_t to UTF-8 in UTF-8
builds. So replace wxT() with wxS() in wxImage options definitions.

Also remove wxT() from the options documentation, it's just useless there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-14 13:35:52 +00:00
Vadim Zeitlin
b6963858fb Added wxIMAGE_OPTION_ORIGINAL_{WIDTH,HEIGHT} wxImage options.
These options allow to retrieve the original image size if the image was
scaled during load.

Closes #13662.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-14 13:35:48 +00:00
Vadim Zeitlin
d6c37f5bc4 Fall back on ::GetMessagePos() if ::GetCursorPos() fails under MSW.
In some rare but reproducible cases GetCursorPos() can fail and return without
filling in the provided point. Fall back to GetMessagePos() if this happens:
this is not ideal but clearly better than using uninitialized position or hard
coding something like (0, 0).

Closes #13664.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-14 12:51:53 +00:00
Vadim Zeitlin
3e6807d701 Don't redefine symbols already defined in latest MinGW headers.
Closes #13645.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-14 12:51:49 +00:00
Vadim Zeitlin
907ea7d5cc No changes, just add another case to a switch on wxMouseButton.
Fix warnings given when wx headers are compiled with g++ -Wswitch-enum option.

Also make the assert messages more precise and less verbose as there is no
need to include the function name in them, all relatively recent compilers
provide it via __FUNCTION__ and wxFAIL_MSG() already uses it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-14 12:51:47 +00:00
Jouk Jansen
49d47a9fff Update compile support fror wxGTK on OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-14 09:39:43 +00:00
Stefan Csomor
933cebdd3c latest private API usage complaint, right now most subclasses are using their own implementation, so this shouldn't lead to problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-14 07:52:33 +00:00
Steve Lamerton
c49d2434e3 Set focus on the browser window after loading a url. Also fix a warning.
Closes #13660

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-13 12:57:28 +00:00
Vadim Zeitlin
d94df7c9ab Added stock accelerator for wxID_PRINT.
Ctrl+P is a pretty standard accelerator for the "Print" command so add it as a
stock one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-13 11:51:49 +00:00
Vadim Zeitlin
e8d243a974 Use wxConvertStringToOle() in wxWebViewIE code.
Fix compilation in wxUSE_UNICODE=0 case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-12 22:47:11 +00:00
Vadim Zeitlin
5061db29ad Correct typo in wxUSE_WEBVIEW_IE test in configure.
Because of a missing '$' before wxUSE_WEBVIEW_IE in the configure test
wxUSE_WEBVIEW was never enabled for wxMSW builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-12 22:47:08 +00:00
Steve Lamerton
a178852467 Replace the sample animation timer with an idle loops and the animation with a busy cursor.
Fixes #13518, #13658

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-12 20:49:40 +00:00
Paul Cornett
5ede3d24c8 position expander in center of given rectangle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-12 16:50:37 +00:00
Paul Cornett
990cf3b959 use correct function to free GtkTextAttributes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-11 16:38:48 +00:00
Vadim Zeitlin
b062fade9f Intercept some keys in wxMSW wxTextCtrl even if they're used as accelerators.
Bare (i.e. without any modifiers) Delete, Home and End keys are also required
by the text control itself so don't handle them as accelerators when wxTextCtrl
has focus.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-11 14:26:06 +00:00
Jouk Jansen
e2847646e5 Add compile support for widgets sample on OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-10 14:41:14 +00:00
Vadim Zeitlin
d7a46c4eb8 Compilation fix for wxUSE_UNICODE=0 build after wxUSE_STL=1 fix.
The result of wxString::mb_str() can't be converted to wxScopedCharBuffer in
non-Unicode build but converting it to wxCharBuffer is always fine (though
slightly less efficient).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-10 11:58:04 +00:00
Vadim Zeitlin
bbd65eb803 Correct the direction passed to wxDataObject in wxOSX clipboard code.
Query for formats that wxDataObject supports on input, not output, in
wxClipboard::GetData().

This is similar to r69454 For wxGTK.

Closes #13649.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-10 11:49:02 +00:00
Julian Smart
60372b0d54 Applied Blit system options optimization to StretchBlit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-10 10:46:34 +00:00
Vadim Zeitlin
3cf2fe5444 Fix compilation in wxUSE_STL case broken by r69663.
Don't rely on implicit wxString to char* conversion when calling
XRCID_Assign().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-10 00:30:10 +00:00
Vadim Zeitlin
4fb1e79b4d Remove all unwanted occurrences of -mt/-pthread in configure.
Remove all inappropriate compiler options and not just the first one as they
can occur multiple times because they may come from pkg-config output for
several different libraries.

Closes #13647.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-10 00:30:04 +00:00
Robin Dunn
85fb0a0afd Ensure that there is a modal event loop before trying to use it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 17:40:28 +00:00
Robin Dunn
56c1c29904 Add a border on the AutoComp list for wxOSX-Cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 17:39:38 +00:00
Steve Lamerton
e11b9a6be4 Skip spurious blank JavaScript events in wxWebView.
Closes #13481

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 13:34:40 +00:00
Steve Lamerton
f9a786f870 Correctly escape the error log messages in the wxWebView sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 13:23:45 +00:00
Steve Lamerton
538f284a44 Update wxHtmlWindow documentation to refer to wxWebView.
Closes #13608

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 11:35:38 +00:00
Vadim Zeitlin
3bcb0be2bb Don't include wx/msw/wrapgdip.h if !wxUSE_GRAPHICS_CONTEXT.
Fix compilation when GDI+ headers are not available by not including the
header that includes <gdiplus.h> in this case.

Closes #13640.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 11:02:07 +00:00
Vadim Zeitlin
cf0a0f9303 Move GDK_META_MASK definition in the header in which it is also used.
The code using GDK_META_MASK was moved to wx/gtk/private/event.h from
gtk/window.cpp but the fallback definition of GDK_META_MASK for GTK+ < 2.10
remained in window.cpp.

Move it to the header as well now so that it can be compiled with GTK+ < 2.10
again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 11:02:05 +00:00
Vadim Zeitlin
b6dd4afdf8 Compilation fixes for GTK+ 2.4.
Add missing GTK_CHECK_VERSION(2,6,0) checks.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 11:02:02 +00:00
Vadim Zeitlin
bedba0d176 Add missing stdio.h include to wxGTK assert dialog code.
As we use FILE for saving the assert message to a file, we must include
<stdio.h> (which is not included from any other header, at least not under
Solaris).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 11:01:58 +00:00
Václav Slavík
0fff3dfcbb Use Enter and Space for cell editing in generic wxDVC too.
If the normal Enter or Space processing (sending activate event or doing
activatable editing respectively) isn't handled by the control, use
these keys to trigger inline editing too, as F2 does.

This makes the Windows control more similar to OS X and GTK+ ones and
makes discovering editability easier.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-08 10:53:49 +00:00
Jouk Jansen
5ced53e599 Updates to compile WX on OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-07 09:42:06 +00:00
Jouk Jansen
a1db2ca07b wxGTK1 should not include .h files for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-07 09:34:50 +00:00
Vadim Zeitlin
5325c2e39b Updated all message catalogs to correspond to the current sources.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-06 12:07:35 +00:00
Vadim Zeitlin
bf6968237d Chinese translations update from Jiawei Huang.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-06 12:06:46 +00:00
Vadim Zeitlin
2673c2394a Use current time, not the Epoch for time zone determination.
When deducing the time zone from struct tm tm_gmtoff field, query tm for the
current time and not the Epoch as the DST rules -- and hence the time zone
offset -- could have changed since 1970. This is notably the case for Ireland
which used a different time zone from 1968 to 1971.

Notice that GetTimeZone() still must return the time zone without taking DST
into account, so we explicitly compensate for DST if it's in effect.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-06 12:06:43 +00:00
Václav Slavík
12a7fb5f0b Fix wxArray::Index() with bFromEnd=true in STL build.
This function incorrectly returned index from the end of the array when
searching from the end. Fixed to work as the non-STL version.

Fixes #13626.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 15:20:32 +00:00
Václav Slavík
23f32cd750 Test correctness of wxArray::Index() with bFromEnd=true.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 15:20:11 +00:00
Francesco Montorsi
7e6ab75033 no real change: just move Docset/CHM/QCH declarations in their own sections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 12:25:46 +00:00
Francesco Montorsi
ef74fc64a1 Move detailed documentation to the top, leaving styles and event tables at the bottom, like for any other wxWidgets control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:55:42 +00:00
Francesco Montorsi
deed8373ae fix some simple Doxygen warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:55:00 +00:00
Francesco Montorsi
38ea03c936 better links to the stock item ID list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:54:14 +00:00
Vadim Zeitlin
535a0e0889 Allow reusing the same wxWindowID more than 254 times.
Extend the id reference count storage to use an overflow hash map for the ids
used more than 254 times. This allows to use the same id an arbitrarily large
number of times.

Closes #13618.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:24:04 +00:00
Vadim Zeitlin
c052f780a4 Use wxWindowUpdateLocker to speed up updates of the static widgets sample page.
See #13619.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:24:00 +00:00
Vadim Zeitlin
3a6b6a9889 Fix adding a control to two different sizers in the widgets sample.
A checkbox on the static page was added to two sizers at once, resulting in
heap corruption later. Fix this by adding it to the right sizer only.

Closes #13619.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:23:57 +00:00
Vadim Zeitlin
c977643bb1 Translate the log message in wxLog destructor.
The message about losing the last message was not translated for some reason,
do translate it now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:23:54 +00:00
Vadim Zeitlin
2371703475 Fix format string in wxLog::LogLastRepeatIfNeeded().
We used a format string without any format specifiers in it in a call to
wxString::Printf() which always had a parameter resulting in an assert failure
about a mismatch between the string and parameter count.

Fix this by using a separate Printf() call for this case.

Closes #13613.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:23:51 +00:00
Vadim Zeitlin
b059c519bf Use correct direction in wxDataObject::IsSupported() in wxOSX dnd code.
Before calling wxDataObject::SetData() we must check whether the object
supports this format using IsSupported(Set) instead of just IsSupported()
which does the test in the "Get" direction.

Closes #13615.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:23:48 +00:00
Vadim Zeitlin
041e6050fd Don't read beyond the end of input buffer when decoding UTF-16.
wxMBConvStrictUTF8::FromWChar() didn't update the input length correctly when
encountering a surrogate while decoding UTF-16 and could read beyond the end
of the input buffer in this case.

Fix this by simply adjusting the input length when a surrogate is read.

Closes #13614.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:23:44 +00:00
Vadim Zeitlin
64b91e2d40 Add wxConvAuto::GetBOMChars() helper.
Closes #13620.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 11:23:41 +00:00
Francesco Montorsi
75e488d501 document wxLogGeneric() function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 10:44:35 +00:00
Francesco Montorsi
b2fc9f0e3b document wxConfigPathChanger helper class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 10:42:16 +00:00
Vadim Zeitlin
86cf0018d3 Rename lineAnchor in Scintilla code to avoid shadowing warning.
Local variable "lineAnchor" in Editor::SetRectangularRange() was shadowing the
member variable Editor::lineAnchor, resulting in warnings from some compilers
(AIX xlC, Sun CC).

Rename it to "lineAnchorRect", just as it was done in the latest Scintilla
sources, to avoid them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-05 10:28:48 +00:00
Vadim Zeitlin
e2623304af Correct the misleading example of using id ranges in XRC documentation.
"range[end]" is the last id in the range, inclusive, not the first id after it
so any loops iterating over all ids in the range should cover it as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-04 17:41:20 +00:00
Vadim Zeitlin
d265ec6b0e Simplify wxIdRange code by using new XRCID_Assign() function.
Only traverse the id hash once in XRCID_Assign() instead of using
RemoveXRCIDEntry() to delete the old entry (which usually doesn't exist so
this traversed the entire hash) followed by XRCID_Lookup() to create a new one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-04 17:40:49 +00:00
Vadim Zeitlin
6bb81c8e1a Fix choice of tree item icon for the selected state in wxMSW.
The logic for selecting the item icon was broken when selected image was
specified as it was not taken into account as fallback for selected expanded
state so selected icon was used only for collapsed items.

Fix this by using the selected icon if it is specified and selected expanded
one is not.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-04 12:02:07 +00:00
Vadim Zeitlin
4878fbb880 Make wxQsort() definition exactly the same as declaration.
Remove the extra "const" in the first parameter.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-04 09:09:54 +00:00
Robin Dunn
884a3e9d37 Add wxAnyButton so the shared class hierarchy of wxButton and wxToggleButton is accurate.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-04 03:38:09 +00:00
Robin Dunn
0e8dff1b3c Fix missing and broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-04 01:33:37 +00:00
Jouk Jansen
823093e4a4 Upadte setup for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-03 09:38:44 +00:00
Robin Dunn
6db0bd9256 Fix missing or broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-02 23:42:26 +00:00
Robin Dunn
7106fc4674 Fix missing or broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-02 20:22:29 +00:00
Vadim Zeitlin
c276efd946 Improvements to German translation.
- Changed phrasing of some texts
- Replaced words by more commonly used ones
- Translated untranslated words and sentences
- Used clear translation for vague expressions
- Used common translation for multiply used terms like "save"

Patch from Sebastian Walderich.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-02 19:08:54 +00:00
Vadim Zeitlin
8000083c51 Orthographical fixes in German translation.
- Corrected misspelled words
- Corrected upper and lower case words
- Corrected some typos, like "HTLM" and "DDMEL"
- Corrected some grammar errors

Patch from Sebastian Walderich.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-02 19:08:51 +00:00
Vadim Zeitlin
ce316f2890 Hyphen fixes in German translation.
- Added missing hyphens to concatenate german words
- Concatenated wrongly separated word

Patch from Sebastian Walderich.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-02 19:08:49 +00:00
Vadim Zeitlin
970b8299e0 Punctuation fixes in German translation.
- Fixed some menu entries which where using '$' instead of '&'
- Added missing punctuation marks to equal the original text
- Removed unneeded and double characters

Patch from Sebastian Walderich.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-02 19:08:46 +00:00
Vadim Zeitlin
666ce81a57 Corrections to spaces in German translation.
Patch from Sebastian Walderich.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-02 19:08:43 +00:00
Vadim Zeitlin
beee38cb41 Explicitly include X11/Xlib.h to fix AIX build.
At least under AIX X11/Xlib.h is not included from X11/Xutil.h so include it
explicitly ourselves. It should do no harm on the other systems.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-01 12:04:27 +00:00
Vadim Zeitlin
3c3f29b5f1 Define _LINUX_SOURCE_COMPAT for AIX build.
This takes care of the conflict between GTK+ headers and #define of func_data
in AIX sys/timer.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-01 12:04:24 +00:00
Vadim Zeitlin
f81ccc1148 Make wxTreeListEvent dynamically creatable.
This is unfortunately required by wxEvent::Clone() support unit test so
provide the default ctor in this class even though it doesn't make any sense
in normal use.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 19:41:06 +00:00
Vadim Zeitlin
824216af78 Correct wxFileName::SetPath() documentation.
It wrongly claimed that this function affected the full path, i.e. including
name and extension, which was simply wrong.

Closes #13612.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 19:33:43 +00:00
Paul Cornett
e503ef07d5 fix creation of bitmap from image with requested depth 32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 16:09:47 +00:00
Vadim Zeitlin
898c3e88e9 Suppress harmless unused variable warnings in wxSocket under AIX.
The size of the buffer is not used with AIX conventions for gethostbyaddr_r()
and getservbyname_r() functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 14:24:54 +00:00
Vadim Zeitlin
6677f122a1 Fix compilation of wxGethostbyname_r() and wxGethostbyaddr_r() under AIX.
gethostbyname_r() and gethostbyaddr_r() functions return int, not hostent*,
under AIX so assign their return value to the error indicator.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 14:24:51 +00:00
Vadim Zeitlin
5fe43b6017 Compilation fix for AIX: fix the name of wxGetservBuf ctor.
The ctor was wrongly called so wxGetservBuf class couldn't be compiled,
breaking compilation under AIX and any other systems with 4 argument
getservbyname_r().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 14:24:49 +00:00
Julian Smart
4f51b983c2 Fixed #13535: wxRichTextCtrl: Incorrectly documented or named functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 12:15:05 +00:00
Dimitri Schoolwerth
275c64304e Fixed dropdown height of wxChoice and wxComboBox controls.
When using comctl32.dll versions prior to 6.0 (e.g. with Win2k or no manifest file) the dropdown height of a wxChoice and wxComboBox would show all but one item and a vertical scrollbar was always visible. Fixed by reintroducing code that adds 1 to the total number of items. The code got dropped in r60553, added a comment to it in the hope that it will not be lost again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 11:30:45 +00:00
Vadim Zeitlin
30d7a99071 Mention setting up file as default download on SF in release docs.
The newly uploaded files must be configured to be default downloads as
otherwise SF continues to propose the old files by default.

See #13347.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 10:49:52 +00:00
Vadim Zeitlin
97b18a77f4 Compilation fix for wxUSE_GRAPHICS_CONTEXT && !WX_PRECOMP.
Include wx/dcclient.h to get wxPaintDC declaration necessary in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 10:42:42 +00:00
Vadim Zeitlin
480ce50f75 Correct FSF postal address in the licence text.
Closes #13411.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 10:40:52 +00:00
Vadim Zeitlin
b76f9c93fc Remove duplicated and apparently unnecessary licence file.
This file was exactly the same as docs/licence.txt so keep just one of them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 10:40:50 +00:00
Paul Cornett
4ccb6db090 add gdk_window_get_height/width
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 05:42:10 +00:00
Paul Cornett
c968ba805b simplify Refresh(), ancestors of a mapped window have to be mapped also, no point in checking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 05:36:51 +00:00
Paul Cornett
6d50fadaea in DoSetSize, only call GetPosition if necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 05:22:59 +00:00
Paul Cornett
cb0c51acf8 correct callback function signature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 05:15:04 +00:00
Paul Cornett
f0b87ef91c move class function out of extern "C" block
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 05:14:13 +00:00
Paul Cornett
98185146b3 simplify code calling gtk_window_set_urgency_hint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 04:35:56 +00:00
Vadim Zeitlin
6460ce5afe Avoid too many sash position changed events when splitter is resized.
We could call SetSashPositionAndNotify() twice in a row which was probably
unexpected and possibly wasteful, if the user code did anything non trivial in
response to this event.

Just call it once after we're certain which sash position do we want to set.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 19:48:50 +00:00
Vadim Zeitlin
1b5dfa53aa Fix the check for second window becoming too small in wxSplitterWindow.
There was a strange check for the second pane size in OnSize() which hardcoded
5 pixels as minimal pane size in the check and 40 pixels as the minimal size
to set. This resulted in strange behaviour when the second pane size would
decrease to 6 pixels smoothly and then jump back to 40 pixels when the
splitter window was resized and also was ugly at the code level.

Get rid of this code and simply call AdjustSashPosition() to ensure that the
sash position remains valid as the splitter is resized.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 19:48:48 +00:00
Vadim Zeitlin
853f4764c0 Make the initial sash position work in splitter sample.
The initial splitter size must be set correctly when using gravity with
wxSplitterWindow as otherwise the sash would jump on first resize -- which was
exactly what happened in the splitter sample.

Add a SetSize() call to the sample with the comment explaining why is it
needed and also actually make it stick as the cached last size was not updated
before the splitter was split before.

Closes #9821.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 19:48:44 +00:00
Vadim Zeitlin
c79d40fe1e Don't apply gravity before requested sash position was set in wxSplitterWindow.
Gravity should take effect only after the originally requested sash position
is set as otherwise it's not really taken into account.

Closes #13508.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 19:48:40 +00:00
Vadim Zeitlin
31174267f8 Remove wxSplitterWindow::m_checkRequestedSashPosition.
This variable seemed to be redundant with m_requestedSashPosition being set to
INT_MAX so harmonise the code to always check for the latter and get rid of
the former.

There should be no observable changes in behaviour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 19:48:38 +00:00
Vadim Zeitlin
8219f7f982 No changes, just remove wxSplitterWindow::{Set,Get}NeedUpdating().
GetNeedUpdating() was never used at all while SetNeedUpdating() was used only
once while m_needUpdating variable was being changed directly in other places
making the code difficult to follow.

Just use the member variable directly and remove the accessors.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 19:48:34 +00:00
Julian Smart
d3f6b1b575 Fixed problem with the size of paragraphs not needing layout not being taken into account when calculating overall box size.
Should fix the problem with lines becoming insensitive to mouse clicks after adding a couple of shorter lines.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 17:28:03 +00:00
Vadim Zeitlin
3ac17397c5 Perform wxAuiToolBar idle updates from UpdateWindowUI(), not OnIdle().
No real changes, just optimize the idle updates by doing it from (less often
called) UpdateWindowUI() instead of EVT_IDLE handler.

Closes #10075.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 16:51:10 +00:00
Vadim Zeitlin
f5fccd52d4 Generate right click events for all kinds of items in wxAuiToolBar.
Don't generate wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK for normal items only,
they can be useful for other ones too.

Note that this had been previously applied to 2.8 branch as r66926 but somehow
wasn't applied to the trunk.

Closes #10079.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 16:44:24 +00:00
Vadim Zeitlin
b2447e8408 Fix splitting message into title in body in MSW wxProgressDialog.
If the message doesn't contain any new lines, it should be used as the body,
not the title as having title without body doesn't make sense and looks
strange.

Closes #13441.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 16:41:34 +00:00
Vadim Zeitlin
c22ce32199 Don't replace non default wxMessageDialog labels with default translations.
The code translating the button labels of wxMessageBox to the application
language was overeager and replaced even the custom labels with the
translations of the default ones.

This shouldn't be done, of course, so simply check that no custom labels had
been set before translating.

See #10962.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 16:22:30 +00:00
Vadim Zeitlin
9a29fe70bc Change variables naming convention in wxAUI code.
Use the standard wxWidgets camelCase convention instead of the
old_one_using_underscores for all the private variables.

Closes #13476.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 14:20:03 +00:00
Vadim Zeitlin
ea10101a15 Link tests with webview library only if it is actually available.
This allows the tests to build again even on the machines without the
prerequisites for building wxWebView.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 14:19:59 +00:00
Vadim Zeitlin
74e0e33a85 Remove apparently unnecessary wxAuiMDIClientWindow dtor.
This dtor doesn't seem to do anything useful as the base class dtor already
destroys all window children anyhow and removing it is reported to fix some
crashes in wxAUI (which is surprising and probably hides some other bug...).

Closes #13547.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 14:19:55 +00:00
Vadim Zeitlin
05f4dfa726 Add wx/datetimectrl.h to the wxAdv files list.
Ensure that this header is installed by "make install" as it ought to.

Close #13529.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 14:19:51 +00:00
Vadim Zeitlin
7e132bdd47 Fix assert in generic wxListCtrl icon view when using images.
Don't assume that the item image is a valid index in m_small_image_list as we
may be in icon view which doesn't use small images at all.

For now restrict this code to the report view mode as apparently the cached
line height is not supposed to be used in other modes even though it's not
clear whether this is really the case and so, perhaps, this code should also
be used when in small icons view mode.

Closes #13604.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 14:19:47 +00:00
Julian Smart
dabf7342ef Fixed warning when compiling richttextctrl.cpp in VS2010 (fixes #13606)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 13:39:11 +00:00
Julian Smart
031b5b0c2f Add indents to maximum size to prevent problems with paragraph layout (fixes #13458).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 13:34:43 +00:00
Vadim Zeitlin
911219b2ab Allow customization of the locations where persistent settings are stored.
Make it possible to set a non-default wxPersistenceManager to use and allow
overriding of GetConfig() and GetKey() methods by making them virtual and
documenting them.

This can be notably used to allow porting of the existing code to use
wxPersistenceManager while keeping compatibility with the old settings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 10:08:18 +00:00
Vadim Zeitlin
eacfac2d5e Fix return value of wxPersistentSplitter::RestoreValue().
It used to always return false which didn't allow the code using to decide
whether the default splitter position should be used or not.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 10:08:14 +00:00
Robin Dunn
7cab9c4193 Add missing interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-29 21:34:49 +00:00
Robin Dunn
c78f085763 resolve multiple inheritance ambiguity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-29 04:50:04 +00:00
Paul Cornett
07acbd34a5 parenthesize bitwise operator in logical expression
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-29 04:49:38 +00:00
Vadim Zeitlin
038809c2f6 Make BOM-detection code in wxConvAuto public.
Export GetBOM() and DetectBOM() functions.

Also rename BOMType enum elements to use "wx" prefix now that they're public.

Closes #13599.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 22:48:54 +00:00
Vadim Zeitlin
76ff3d06f5 No changes, just simplifications to configure code.
Implicitly use SEARCH_LIB in WX_PATH_FIND_LIBRARIES() and WX_FIND_LIB() macros
to avoid having to pass it to them explicitly every time.

Closes #13601.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 22:48:50 +00:00
Vadim Zeitlin
776f4b8df8 No changes, just remove redundant code.
Don't call FindToolByPosition() again in wxAuiToolBar::OnLeftUp() when we just
called it above.

Closes #13600.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 22:48:46 +00:00
Vadim Zeitlin
e4c8592e9c Add _PTR WX_DECLARE_HASH_SET variants to fix warnings about operator->().
Macros from WX_DECLARE_HASH_SET family could declare an operator->() which
could never be called because it returned a pointer to a non-object (e.g. a
pointer or a primitive type).

Fix this in the same way as for WX_DECLARE_ARRAY macros by adding (badly but
consistently) named _PTR variants of the macros to allow defining the versions
without operator->().

This fixes tons of warnings when building wx with Sun CC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 22:26:10 +00:00
Vadim Zeitlin
c155b9b519 Use WX_XXX_ARRAY_PTR macro variants for arrays of pointers.
Arrays of pointers must not overload operator->() as it is not used with them
and is, in fact, unusable, provoking a warning from Sun CC every time such
array is declared. Use the special _PTR-suffixed versions to avoid this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 21:10:51 +00:00
Vadim Zeitlin
449cc35153 Don't make wxQsort() extern "C" nor use any special convention for it.
It doesn't make sense to require passing C functions to wxQsort() that we
define in a C++ library. We also don't need any special calling convention
here.

Notice that the only existing uses of wxQsort() inside wxWidgets itself were
not actually extern "C" and one of them didn't even use the correct calling
convention.

Also avoid using non-wx-prefixed CMPFUNCDATA identifier in a public header,
rename it to wxSortCallback instead.

Finally make wxQsort() documentation slightly more useful.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 21:10:48 +00:00
Vadim Zeitlin
1da8e6e400 Make GTK callbacks passed to GTKConnectWidget() extern "C".
This fixes (harmless but annoying) warnings about mixing C++ and C linkage
function pointers from Sun compiler.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 21:10:45 +00:00
Vadim Zeitlin
14c350dfc7 Explicitly declare environ variable.
While POSIX and SUS both mandate this variable existence, they don't say that
it needs to be declared anywhere and it actually doesn't seem to be declared
under Solaris when using Sun CC and so using it resulted in compilation errors.

Just declare it ourselves to avoid them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 21:10:43 +00:00
Vadim Zeitlin
7451fe7b69 Always include locale.h to get LC_ALL declaration.
For some reason locale.h was only included in !wxUSE_STD_STRING case but we
actually always need it as we use LC_ALL in this file and at least in Sun CC
build it wasn't included from anywhere else so include it from here to fix the
build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 21:10:40 +00:00
Vadim Zeitlin
4cbbbd069e Remove unused wxIFFDecoder::picptr member variable.
This variable was apparently unused and a local variable with the same name
was used instead, resulting in Sun CC warnings about variable shadowing.

Just remove the unused member variable to fix this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 21:10:38 +00:00
Vadim Zeitlin
fd3dc8e628 No real changes, just remove an extra semicolon.
DECLARE_DYNAMIC_CLASS() shouldn't be followed by a semicolon and Sun CC warns
about it, so fix this by removing it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 21:10:35 +00:00
Vadim Zeitlin
2e92ad1b30 Replace remaining occurrences of _T() with wxT().
Use wxT() everywhere for consistency and to fix compilation with Sun CC for
which _T() is not defined as it clashes with a symbol with the same name in
standard headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 21:10:33 +00:00
Vadim Zeitlin
2f6b64a90b No real changes, just remove trailing commas from enums.
These commas are not allowed by standard C++ and Sun CC warns about them (and
some other compilers, e.g. HP aCC, even give errors for them).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-27 21:10:30 +00:00
Vadim Zeitlin
d0260bd894 Add WX_FIND_LIB() function to simplify testing for libraries in configure.
No real changes in behaviour but the new WX_FIND_LIB() function can now be
used to test for any library.

Closes #13375.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-26 23:20:19 +00:00
Vadim Zeitlin
218116bd0a No changes, just fix some typos in acinclude.m4 comments.
See #13375.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-26 23:20:13 +00:00
Vadim Zeitlin
ea8dd85723 Use AC_LANG_SOURCE and add missing quoting to configure.
This fixes some of the warnings from autoconf 2.68 while still remaining
compatible with 2.61.

Closes #13591.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-26 23:20:10 +00:00
Václav Slavík
5bb82ad49f Fix incorrect handling of ItemsAdded() in wxDataViewCtrl.
When adding items to the model in bulk and then calling ItemsAdded(),
internal representation in both the generic and GTK+ versions wasn't
updated correctly if the order of the notifications was such that an
item would be inserted after other new, but not yet inserted, items.

Fixes bug #13587.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-26 17:10:27 +00:00
Robin Dunn
5e0e1372fd Interface tweaks and fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-26 05:52:53 +00:00
Robin Dunn
e94d46a67c Work around a multiple inheritance ambiguity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-26 05:39:18 +00:00
Stefan Csomor
fdb2f6a2c0 move declaration into cocoa part
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-26 05:38:24 +00:00
Stefan Csomor
ad71431be3 deactivate wxUSE_TIMEPICKCTRL for iphone
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 19:29:12 +00:00
Stefan Csomor
e717ceece7 files added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 18:44:53 +00:00
Stefan Csomor
2e71dcef5c files added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 18:31:02 +00:00
Stefan Csomor
3fe42c7d88 files added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 18:04:24 +00:00
Paul Cornett
3ec3c160bc fix wxMDIChildFrame after r69390 and r69468, TLW realization code should not be called, fixes #13593
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 16:56:57 +00:00
Stefan Csomor
9f17c488fb panelg removal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 16:55:36 +00:00
Stefan Csomor
ba508df042 fixing reentrancy problem under iOS 5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 11:52:02 +00:00
Stefan Csomor
29b7fe3072 fixing iPhone build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 11:51:36 +00:00
Stefan Csomor
c2ba305910 fixing iPhone build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 11:51:08 +00:00
Paul Cornett
1a0d3739c1 avoid GDK warning "drawable is not a pixmap or window"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 06:00:24 +00:00
Paul Cornett
fa23222253 avoid GTK3 warning "GtkNotebook %p is mapped but visible child wxPizza %p is not mapped"
whatever problem this hack was supposed to solve, this was not the way to fix it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 05:12:14 +00:00
Paul Cornett
34949efe0d revert (presumably unintentional) change from r59562, which caused auto-scroll sample selection to be broken for last 2.5 years
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-23 18:03:20 +00:00
Julian Smart
a2c2fdc570 Fix for indeterminate attribute specification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-22 13:49:00 +00:00
Julian Smart
75936ec600 Applied patch #13534: wxRichTextCtrl: Make it easier to use TextEffects flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-22 13:19:40 +00:00
Julian Smart
23d11f0eb4 Allow user to select indeterminate state for font attributes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-22 13:08:00 +00:00
Robin Dunn
fbfdbb0f86 Add missing styles and flags, and specify pure virtuals that are implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-22 02:31:03 +00:00
Robin Dunn
8f199edf33 Add the getters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-21 18:34:20 +00:00
Robin Dunn
f7df828310 It's not an array of pointers to dashes, but rather an array of dash values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-21 18:33:51 +00:00
Václav Slavík
63e55c0ae6 Document wxDataViewModelNotifier callbacks return values.
It doesn't make sense to return anything other than true here, as
failure from one of several notifiers cannot be handled sanely, so just
document that.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-21 16:51:00 +00:00
Václav Slavík
60d6c7fd37 Use the new wxDataViewRenderer activation API in wxTreeListCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-21 16:34:35 +00:00
Václav Slavík
fb57a95e70 Move wxDataViewCustomRendererBase::ActivateCell() to datavcmn.cpp.
It triggered deprecation warnings in user code when it was inline.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-21 16:34:32 +00:00
Robin Dunn
dbac5ccc54 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-21 07:56:01 +00:00
Vadim Zeitlin
d0da5061ce Dirty hack to allow generic wxDatePickerCtrl to compile under MSW.
Don't make wxDateTimePickerCtrl methods pure virtual in its MSW-specific
version as the generic wx{Date,Time}PickerCtrl implementations not using these
methods also inherit from it currently. This is wrong and would need to be
fixed properly later but for now this hack at least allows the generic classes
to compile and, apparently, work under MSW again.

Remove the equally dirty hack used in the generic wxTimePickerCtrl to allow it
to compile which is not needed any more because this one replaces it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-20 16:45:48 +00:00
Vadim Zeitlin
26d863e2b2 Fix wxRichToolTip compilation under MSW without PCH and recent SDK headers.
Include the headers normally included from wx/wxprec.h.

Also define the stuff missing from the headers of some compilers (notably
MinGW but probably also VC6) ourselves.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-20 16:20:19 +00:00
Vadim Zeitlin
f72ed38578 Add "checked" property for toolbar tool elements in XRC.
Allow toolbar tools to be created in checked (or toggled) state in XRC, just
as the menu items can already be created checked.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-20 16:10:35 +00:00
Robin Dunn
675f687593 The new wxImage related gaphics context code uses some new Cairo APIs, add the code needed when loading them dynamically.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-20 04:58:00 +00:00
Robin Dunn
6e6f074b45 Delegate wxGraphicsBitmap::ConvertToImage to the renderer so we do not end up with more than one definition of the method when building with both the GDI+ GC and the Cairo GC enabled at the same time.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-20 04:49:12 +00:00
Vadim Zeitlin
c9b7d15bbb Fix PCH-less compilation of wx/richtooltip.h too.
We need to include the full wxColour declaration instead of just forward
declaring it as we use its ctor for a default value of a parameter.

Also include wx/defs.h to ensure that wxUSE_RICHTOOLTIP is defined before
testing it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-19 21:53:10 +00:00
Václav Slavík
dc73d7f5d4 Cleanup of wxDataViewCtrl cell activation code.
Fix confusion of what cell activation is and inconsistence with native
handling in GTK+. Document the distinction between activating (~
editing) a cell and activating (double-clicking) the whole item.

Deprecate wxDataViewCustomRenderer::LeftClick() and Activate() methods,
replace them with single ActivateCell() that is called for both kinds of
activation.

Fix implementations so that ActivateCell() is not called on
double-click, when it shouldn't, and vice versa: don't send
wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED for cell activation.

Partially reverts r67099 -- restores old 2.9 signatures of compatibility
LeftClick() and Activate() methods.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-19 16:20:17 +00:00
Václav Slavík
4a99d59750 Move InitMouseEvent<T>() to wx/gtk/private/event.h.
It is needed in wxDataViewCtrl now too, in addition to wxWindow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-19 16:20:10 +00:00
Václav Slavík
1d3a930e82 Use wxDatePickerCtrl in wxDataViewDateRenderer.
Inline editor is more in line with the behavior of other editors,
requiring double click to edit values was unexpected.

Also merge the two almost-but-not-quite identical implementations in
generic and GTK+ versions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-19 16:20:06 +00:00
Václav Slavík
31af22fa2d Allow using wxCompositeWindow<T> as wxDataViewCtrl inline editor.
wxDVC inline editing code attaches some event handlers to the editor
control; most importantly, it watches for Enter key and for focus
changes. If the editor control is a composite window, these events occur
in a sub control and never reach wxDVC code.

Fix this by forwarding events to the main window of the composite
control. Only events required by wxDVC are implemented for now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-19 16:20:01 +00:00
Václav Slavík
8df14bedf5 Fix NULL window argument to wxEVT_KILL_FOCUS when creating a TLW.
wxTopLevelWindowMSW::CreateDialog first moved and resized the newly
created window and only then called SubclassWin(). Because native focus
change occurred when moving the window, HWND->wxWindow association
wasn't yet filled in and wxFindWinFromHandle() would return NULL.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-19 16:19:58 +00:00
Václav Slavík
843101f766 Send wxEVT_CREATE and do other post-realization initialization even if the widget was realized early.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-19 16:19:55 +00:00
Václav Slavík
9a237e2f12 Set wxFocusEvent's window value for wxEVT_KILL_FOCUS in wxGTK.
Note that it is still not set for wxEVT_SET_FOCUS, because it's not
immediately obvious how to obtain the previously focused window from
there. It's still better than always having the window NULL.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-19 16:19:52 +00:00
Vadim Zeitlin
83ed867e70 More fixes for PCH-less compilation.
Include declarations for or forward declare more classes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-19 10:58:59 +00:00
Vadim Zeitlin
52bac4d8c8 Fix for PCH-less compilation after wxNonOwnedWindow changes.
Need to include declarations of wx{Memory,Paint}DC classes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 22:59:16 +00:00
Vadim Zeitlin
e520c3f75c Added wxRichToolTip class.
It can be used to show more customizable tooltips than the native wxToolTip
but at the price of using generic implementation in some cases (actually
almost always now, with the exceptions of text control tooltips under MSW).

Extra features include:
 - The balloon-like tooltip form.
 - Possibility to show an icon.
 - Title display in a different form.

More customization could be added later. It should be also possible to fully
implement this class natively under MSW.

Update the dialogs sample to show the rich tooltips in action.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:57:02 +00:00
Vadim Zeitlin
46ea442ca2 Added wxNonOwnedWindow::SetShape(wxGraphicsPath).
TODO: Document.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:56:52 +00:00
Vadim Zeitlin
dd4eefcb29 Document and test behaviour of wxRegion methods when it is invalid.
Document which wxRegion methods can and can't be used when the region itself
is invalid.

Apply the minor changes to wxGTK (Xor() didn't do the right thing, Offset()
didn't assert) and wxOSX (Offset() crashed) to make their behaviour consistent
with wxMSW.

Add a (trivial, so far, but to be extended later) wxRegion unit test checking
that the methods do indeed behave as documented.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:56:48 +00:00
Vadim Zeitlin
caab08ee9b Fix SetShape() in wxOSX/Cocoa.
Explicitly erase the part of the window outside of its shape with a
transparent colour to ensure that it is indeed transparent and not just has
the default solid background.

Closes #13340.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:56:42 +00:00
Vadim Zeitlin
265dd23241 Don't create a valid wxRegion when using default ctor in wxOSX.
Default constructing a wxRegion created an object that unexpectedly passed
IsOk() test in wxOSX. This was completely unexpected so don't do this and
leave default constructed wxRegion invalid, as in the other ports.

Update DoCombine() to be able to deal with the case of an invalid source
region in a way consistent with the other ports.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:56:40 +00:00
Vadim Zeitlin
63415ba9f5 Don't interpret '&' specially in wxTextWrapper.
wxTextWrapper is used for the multiline text for which it doesn't make sense
to use mnemonics so don't interpret '&' specially in the text used with it.

Doing this also allows to remove the hack used in wxDialog::CreateTextSizer()
to deal with it that was used so far.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:56:36 +00:00
Vadim Zeitlin
6a68fe84ba Use wxWindow::GetClientAreaOrigin() instead of MSW functions.
::AdjustWindowRectEx() doesn't seem to work correctly for wxPopupWindow and
still offsets the coordinates by the title bar height even if these windows
don't have WS_CAPTION style. Rather than try to work around this, simply use
wxWindow method instead of the Windows function as shape wxRegion offset.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:56:34 +00:00
Vadim Zeitlin
63af513be3 No changes, just fix a typo in a header comment.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:56:32 +00:00
Vadim Zeitlin
b9ca72aa7b No changes, just fix typo in a comment following an #endif.
The closing comment used wrong symbol.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:56:29 +00:00
Vadim Zeitlin
d5363c04ac Correct the direction passed to wxDataObject in wxGTK clipboard code.
We should quert for IsSupportedFormat(format, Set) before calling SetData()
with this format, not for IsSupportedFormat(Get) which is the default and was
used by the code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:54:53 +00:00
Vadim Zeitlin
e33cedf4c6 Explicitly use _stati64() with MinGW-W64.
Although this compiler provides underscore-less versions of all POSIX
functions, this one only exists in a version with underscore, so use it to fix
compilation with it in ANSI build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-17 22:26:13 +00:00
Robin Dunn
639f81199f Fix more missing and broken stuff in the interface, for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-17 18:53:28 +00:00
Stefan Csomor
d1d9736d86 supporting deployment < 10.6 when compiling against 10.7
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-16 20:57:09 +00:00
Stefan Csomor
a6ac3d64f9 removing QD dependency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-16 19:08:55 +00:00
Vadim Zeitlin
7ef4a97bfd Align multiline labels correctly in wxMSW owner-drawn buttons.
The label wasn't centered correctly in multi-line case.

Closes #13567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-16 17:57:49 +00:00
Steve Lamerton
9a9fa6168a Export a couple of Carbon functions to allow wxWebView to build correctly. This was already done in the wxWebView branch but got missed in the merge to trunk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-16 15:59:31 +00:00
Václav Slavík
fc55eaa0be Set wxDataViewCtrl::m_focusWidget in wxGTK.
The GtkTreeView control that should get the focus in in scrolled window;
the same is already done for wxListBox.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-15 14:19:22 +00:00
Václav Slavík
d81ccfce37 Don't call wxEvent::SetTimestamp() twice in InitMouseEvent<>().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-15 14:19:19 +00:00
Vadim Zeitlin
164db177a2 Don't use wxMSW version of wxNonOwnedWindow at all under WinCE.
This class becomes completely trivial under WinCE as its functionality
(setting the window shape) can't be implemented under this platform, so just
don't compile it at all there.

This both (slightly) reduces the amount of #if checks and should make the code
(slightly) smaller.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-15 00:20:56 +00:00
Robin Dunn
322853b3d6 Add data members for RGBValue and HSVValue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-14 01:38:07 +00:00
Robin Dunn
d554697139 fix parent class and constant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-14 01:37:19 +00:00
Vadim Zeitlin
c105b3cdd4 Don't assert in wxDateTime::Format("%p") in locales not using AM/PM.
If a locale doesn't use AM/PM strings, strftime() can return an empty string
which does not indicate an error, so don't assert that strftime() failed in
this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-13 14:54:29 +00:00
Vadim Zeitlin
bb8823c958 The usual fix for PCH-less compilation after the last commit.
Fix wxNonOwnedWindow compilation in wxGTK without PCH.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-13 13:19:42 +00:00
Vadim Zeitlin
a82afab363 Implement SetShape() for wxPopupWindow in wxGTK.
Move SetShape() implementation from wxTopLevelWindow to wxNonOwnedWindow so
that wxPopupWindow, which also inherits from the latter, could use it as well.

This makes it possible to have popup windows with irregular shapes in wxGTK as
well as in wxMSW and wxOSX.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-13 12:45:56 +00:00
Robin Dunn
b39badac11 Avoid an assert when m_dir is empty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-13 06:40:59 +00:00
Robin Dunn
e33cc297dd Interface tweaks for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-13 06:40:10 +00:00
Vadim Zeitlin
7364317521 And another compilation fix.
This time it really does compile.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-12 18:08:46 +00:00
Vadim Zeitlin
8938c6ca91 Compilation fix after a bad merge.
Fix bad merge artefact in the previous commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-12 18:08:13 +00:00
Vadim Zeitlin
612515aff1 Added wxWindow::GTKHandleRealized() virtual method to wxGTK.
This allows to easily do something in the derived classes when the widget is
realized, without having to deal with GTK+ signals. In particular, get rid of
another "realize" signal handler in wxTopLevelWindow and simply override this
virtual method there.

It also incidentally makes the callback code simpler as the window doesn't
need to be constantly dereferenced.

This shouldn't result in any changes to behaviour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-12 16:22:14 +00:00
Vadim Zeitlin
f854ecb5a8 Move wxUSE_GUI definition from chkconf.h to the top of platform.h.
This avoids warnings about wxUSE_GUI not being defined in Mac tests in
wx/platform.h which are now (since r69387) done before wx/chkconf.h inclusion.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-12 11:20:15 +00:00
Stefan Csomor
5548cbac13 applying slightly modified patch, fixes #13434
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-12 10:10:32 +00:00
Stefan Csomor
4b21235820 moving defines in front of the setup.h to make webkit definitions in setup.h work for Xcode builds as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-12 08:57:40 +00:00
Vadim Zeitlin
06b3e19fcb Make it possible to close "shaped" sample from the menu.
The sample didn't define any handler for wxID_EXIT menu item, do add it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-12 00:35:04 +00:00
Vadim Zeitlin
a378977021 Added missing WXDLLIMPEXP_CORE to wxNonOwnedWindowBase declaration.
This fixes (harmless) MSVC warning C4275 about inheriting DLL-exported class
from a non-DLL-exported base class.

Closes #13554.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-11 17:56:57 +00:00
Vadim Zeitlin
796be9238d Update status bar labels properly after width change in wxMSW.
The labels were not updated (i.e. ellipsized or, on the contrary, displayed in
full) correctly after a status bar field was changed; there was even a FIXME
comment about this in the code.

Fix this by calling DoUpdateStatusText() when the field width is changed and
also update the field width after resetting the existing tooltips.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-11 17:14:09 +00:00
Vadim Zeitlin
4dd8339b2a Don't delete wxTaskBarIcon in wxMSW wxNotificationMessage if we don't own it.
wxNotificationMessage can be associated with an existing wxTaskBarIcon under
wxMSW instead of creating its own one internally and in this case the icon
must not be deleted when the notification is hidden but it was always
destroyed unconditionally by wxNotificationIconEvtHandler created by
wxAutoNotifMsgImpl.

Fix this by only creating this helper event handler if we do own the icon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-11 17:08:02 +00:00
Vadim Zeitlin
bbcf2821a1 Move SetBackgroundBitmap() from wxPanel to new wxCustomBackgroundWindow.
wxCustomBackgroundWindow is a new class allowing to set a custom bitmap for
the background of any window. The relevant code was mostly moved from wxPanel
to which it was added only recently (before 2.9.2) making it unnecessary to
preserve compatibility.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-11 17:07:43 +00:00
Robin Dunn
7422d79765 wxGraphicsRenderer::CreateContextFromImage is not static
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-11 06:30:30 +00:00
Robin Dunn
7b8c3373a3 Remove the ctor and Init methods that are not available on all ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-11 05:33:31 +00:00
Vadim Zeitlin
7652eada41 Fix warnings about wxOSX_USE_CARBON being undefined when using g++.
Test for __WXMAC__ before testing wxOSX_USE_CARBON to avoid -Wundef warnings
from g++ in non-Mac builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-10 17:12:42 +00:00
Vadim Zeitlin
3648be1f8f Fix PCH-less build after adding wxNonOwnerWindow in wxMSW.
Include the required headers when not using PCH to fix compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-10 17:08:44 +00:00
Vadim Zeitlin
5bd0ee9966 Move wxTopLevelWindow::SetShape() down to wxNonOwnedWindow.
Also add wxNonOwnedWindow for wxMSW (which previously simply typedef'd it to
wxWindow) and document this class now that it provides some user-visible
functionality.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-10 10:53:23 +00:00
Vadim Zeitlin
95c0502bae No changes, just get rid of unnecessary variables in wxCairoBitmapData.
Don't use bw and bh when we have perfectly appropriate m_width and m_height.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:35 +00:00
Vadim Zeitlin
00953cf010 Don't declare wxCairoFontData::m_underlined unnecessarily.
This member was only used in wxGTK-specific code but it was declared for all
platforms which was unnecessary and confusing.

Move its declaration in wxGTK-only section of the class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:32 +00:00
Vadim Zeitlin
fa378d369f Allow creating wxGraphicsFont without using wxFont.
This is mostly important to allow using wxImage-based wxGraphicsContext
without requiring X server connection under Unix: as wxFont can't be used
without X server, we needed another way to create wxGraphicsFont in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:29 +00:00
Vadim Zeitlin
a95f35b07a Remove font scaling from wxMSW wxGraphicsContext.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:25 +00:00
Vadim Zeitlin
0a470e5ea5 Allow creating wxGraphicsBitmap and wxGraphicsContext from wxImage.
Provide a way to use wxGraphicsContext to draw on wxImage.

This is implemented internally by drawing on wxGraphicsBitmap which can be now
also created from wxImage.

Add a test of the new functionality to the image sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:22 +00:00
Vadim Zeitlin
12493a5fb8 Refactor wxGDIPlusFontData ctor to allow using it without wxGDIPlusContext.
wxGDIPlusFontData only needs wxGDIPlusContext to get the font unit to use, so
pass the font unit directly to the ctor to allow also using it when there is
no context at hand.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:18 +00:00
Vadim Zeitlin
645f9bd377 Simplify and rationalize wxGDIPlusContext class constructors.
Remove the now unnecessary default ctor from wxGDIPlusContext and
wxGDIPlusMeasuringContext and add a ctor taking just wxGraphicsRenderer that
can be useful to the derived classes instead.

Merge Init() and SetDefaults() and initialize everything at once in the new
Init() now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:16 +00:00
Vadim Zeitlin
364197e882 Don't make private wxGraphicsContext-derived classes dynamically creatable.
This doesn't make any sense because classes such as wxGDIPlusContext,
wxGDIPlusMeasuringContext and wxMacCoreGraphicsContext are private and don't
need to be creatable by name (only renderers potentially need to be) and was
inconsistent with Unix/Cairo backend in which these classes were not dynamic.

So remove wxRTTI macros from them in wxMSW/wxOSX as well as this allows us to
get rid of unnecessary default ctors.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:13 +00:00
Vadim Zeitlin
7931320806 Fixed non-existent wxCairoContext default ctor.
wxCairoContext class declared default ctor which wasn't implemented and even
couldn't be implemented because its base class didn't have any default ctor
neither.

Fix this by providing a ctor taking wxGraphicsRenderer* and implement it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:10 +00:00
Vadim Zeitlin
08b2d55fdf Added wxGraphicsBitmap::ConvertToImage().
Allow to convert wxGraphicsBitmap directly to wxImage, without passing by
wxBitmap.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:07 +00:00
Vadim Zeitlin
5f606e6515 No changes, just refactor wxCairoBitmapData ctor.
Extract the code for buffer and surface creation into separate helper
functions so that they could be reused by other constructors (to be added in
the next commits).

Also use cairo_format_stride_for_width(), if available, to compute the stride
for the surfaces we create instead of hard coding 4*width.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:04 +00:00
Vadim Zeitlin
3c9e0b81fa Document wxGraphicsBitmap and methods involving it.
Document wxGraphics{Context,Renderer}::CreateBitmap() and CreateSubBitmap()
and wxGraphicsContext::DrawBitmap() as well as the (trivial) class itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:07:01 +00:00
Vadim Zeitlin
0419fee9c3 Implement EVT_MOUSE_CAPTURE_LOST handling for wxPopupTransientWindow.
Handle mouse capture lost events instead of polling for the mouse status in
EVT_IDLE handler. This is not only more efficient but also catches the cases
when the capture was lost before OnIdle() could be executed which could result
in assertion failures and, before the previous commit, even crashes.

The idle-time code is still used for wxOSX/Carbon because it doesn't seem to
generate mouse capture loss events currently -- but should be removed as soon
as support for these events is added.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:02:05 +00:00
Vadim Zeitlin
f9e19204bf Implement delayed destruction for wxPopupTransientWindow.
Windows of this class can be destroyed at any moment, even while some events
are still being processed, so delay the real destruction until we can be sure
that it's safe to delete the window.

This fixes problems (crashes due to dangling pointers) when the object is
deleted from the overridden OnDismiss(), for example.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:02:02 +00:00
Vadim Zeitlin
4506b42ce9 Fix inheriting parent background colour in wxPanel in wxMSW.
wxPanel didn't inherit the background colour set for its parent any more in
wxMSW because its HasTransparentBackground() didn't return true unless the
panel was a child of wxNotebook. This was wrong because not only themed
notebook background should be inherited but also any solid background
explicitly set for a panel parent.

Fix this by returning true from MSWHasInheritableBackground(), which is used
by wxPanel::HasTransparentBackground() under MSW, if the window has an
explicitly set and inheritable background colour.

Closes #13487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 22:01:57 +00:00
Václav Slavík
28fefd45f9 Return true from wxDataViewMainWindow::ItemDeleted().
Presumably, 'false' indicates failure, but there's no failure here: if
an item is not visible, because its parent wasn't expanded yet, it's
perfectly OK that we don't need to do anything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 13:07:10 +00:00
Steve Lamerton
a1a1790666 Reuse existing MinGW defines for all compilers that are missing them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 10:45:16 +00:00
Robin Dunn
d775ec48a7 Interface updates for Phoenix. Add wxNativeFontInfo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-09 01:28:20 +00:00
Steve Lamerton
7cd038613b Work around the fact that wxWebViewIE doesn't send page changing and page changed events during a refresh, yet IsBusy returns true.
Closes #13518

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-07 21:25:59 +00:00
Václav Slavík
a67e6b86f6 Handle inline editing in generic wxDataViewCtrl as Windows 7 does.
Mimic the behavior of Windows 7's Explorer: edit the item that has focus
if it is selected or the first selected item if focus is out of
selection.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-07 17:24:06 +00:00
Václav Slavík
1c8e71c92d Add columns focus and keyboard navigation to generic wxDataViewCtrl.
The UI tries to mimic Windows 7's Explorer's approach as much as
possible, taking inspiration in the GTK+ implementation when
appropriate. In particular, as long as the user doesn't use horizontal
navigation keys, everything looks as before and the user isn't bothered
with the existence of per-cell focus.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-07 15:03:02 +00:00
Julian Smart
f18d5c6f24 Allow selected symbol to be scrolled into view initially
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-07 03:51:23 +00:00
Steve Lamerton
8acbf08b2a Fix various GCC warnings in wxWebView.
Closes #13532

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-06 17:55:43 +00:00
Steve Lamerton
2bcada5f33 Ensure we pass the correct type of string to EscapeFileNameCharsInURL in wxWebViewArchiveHandler.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-06 10:01:17 +00:00
Steve Lamerton
f2ae0da1b5 Delete the filesystem used by wxWebViewArchiveHandler when we are done with it. Fixes a memory leak.
Closes #13500

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-05 21:21:51 +00:00
Steve Lamerton
3949871086 Store a pointer to each ClassFactory so we can correctly release it when the browser closes. This fixes a few more memory leaks.
See #13500

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-05 17:23:51 +00:00
Steve Lamerton
24fb46ea48 Delete the timer on close in the wxWebView sample. Fixes another memory leak.
See #13500

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-05 08:05:42 +00:00
Robin Dunn
dc36332879 Add Get|SetPrintMode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-04 21:37:06 +00:00
Vadim Zeitlin
ba7df825c9 Fix wxTimePickerCtrl compilation without PCH too.
Include commctrl.h explicitly when not using PCH (this completes fixes of
r69293).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-04 17:03:28 +00:00
Robin Dunn
9a0774600b Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-04 07:45:08 +00:00
Vadim Zeitlin
ae97a3bdab Fix wxDateTimePickerCtrl compilation without PCH.
Include the MSW private headers usually included from the PCH file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 17:39:21 +00:00
Steve Lamerton
ad410224a3 Add new definitions required by MinGW for webview. Re-enable custom schemes as a result.
See #13509

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 16:20:15 +00:00
Vadim Zeitlin
f58f412be8 Fix current field highlighting in generic wxTimePickerCtrl under wxGTK.
In wxGTK, calling HighlightCurrentField() from EVT_SET_FOCUS handler was not
enough as the highlighting was overwritten by the default behaviour of
selecting the entire text control contents on focus gain.

Fix this by calling SetFocus() from HighlightCurrentField() before updating
the selection. This ensures that the correct field is always highlighted.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 13:15:19 +00:00
Vadim Zeitlin
4e419dfbbe Added GTK+ screenshot of wxTimePickerCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 12:58:52 +00:00
Vadim Zeitlin
e941b45e41 Use wxSP_WRAP for generic wxTimePicker spin button.
This ensures that the spin button arrows are always enabled, as they should
be, even under wxGTK where wxSpinButton disables its arrows on its own if its
value reaches the end of its range and wxSP_WRAP is not used.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 12:58:48 +00:00
Steve Lamerton
2112ca2d61 Remove copied class definitions from missing.h. Disable custom scheme handling under MinGW as it lacks the correct definitions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 12:21:22 +00:00
Vadim Zeitlin
00103b7dd6 Put wxWebView library addition on top of changes list.
This list is supposed to be roughly in importance order.

Also add a period at the end of wxAuiNotebook entry, let's try to be
consistent about using them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 11:32:20 +00:00
Vadim Zeitlin
84ba6659ad Fix setting tooltips for wxSearchCtrl and other composite controls.
Propagate SetToolTip() call on wxCompositeWindow to all subwindows to ensure
that the tooltip is shown for all parts of the window.

Notice that this is still not ideal as the tooltip temporarily disappears when
mouse moves from one subwindow to another, instead of staying in place as it
does with "monolithic" windows and ideally we should find a way to avoid it
(should be possible at least under MSW with TTM_RELAYEVENT) but for now this
is already much better than nothing.

Closes #13523.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 11:28:54 +00:00
Vadim Zeitlin
2039dd917c Add wxWindowBase::CopyToolTip() method.
This method simply sets the same tooltip for the window but making copy of,
instead of taking ownership of, the wxToolTip passed in.

It's not especially useful on its own but is needed by wxCompositeWindow and
might be handy elsewhere.

See #13523.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 11:28:45 +00:00
Vadim Zeitlin
a166dbbab5 Restore correct wxSearchCtrl size in wxMSW after wxTextCtrl changes.
The code in generic wxSearchCtrl implementation was broken by the changes of
r69066 which deccreased the best height of border-less text controls.

Ideally we should probably change wxSearchCtrl::LayoutControls() to not be
sensitive at all to the exact value returned from wxTextCtrl::GetBestSize()
and just always centre everything vertically but this doesn't look simple to
do with the current code so just override wxSearchTextCtrl::DoGetBestSize() to
return the same size as wxTextCtrl used to return before to fix this for now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 11:28:40 +00:00
Vadim Zeitlin
97d5c7a3d0 Fix harmless warnings in hot key code in wxOSX.
Don't compare signed and unsigned variables if possible (insert a cast in one
place where it wasn't).

Put WXUNUSED() around the unused parameters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 11:28:36 +00:00
Vadim Zeitlin
fb5f677b6a Fix harmless gcc initialization order warning.
Put the initializes in wxDataViewTreeNode constructor initialization list in
order of their declaration.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 11:28:32 +00:00
Vadim Zeitlin
623af45784 zh_TW translation update from cw.ahbong.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 11:27:20 +00:00
Steve Lamerton
873ff54b1f Derive wxAuiNotebook from wxBookCtrlBase. Document wxAuiNotebookEvent which now derives from wxBookCtrlEvent. Update the notebook sample to add wxAuiNotebook as an option.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-02 10:29:00 +00:00
Steve Lamerton
079c683c3d Add event descriptions to wxAuiNotebook.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-01 19:40:20 +00:00
Steve Lamerton
9e0fb96615 Correctly initialise ref count in custom scheme class factory.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-01 19:22:28 +00:00
Robin Dunn
75ded4d173 Use wxAlphaPixelData if the source bitmap depth is 32 or if on wxGTK and there is a mask. Add a separate pass on MSW if there is a mask to adjust the cairo surface's alpha to match the mask.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-30 23:40:02 +00:00
Vadim Zeitlin
54c730a94f Fix the comparison direction in wxTextAttr::BitlistsEqPartial().
The comparison was apparently reversed.

Closes #13521.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-30 15:26:39 +00:00
Vadim Zeitlin
39429ad146 Fix assert in initial call to wxPostScriptDC::SetPen().
Attempt to use wxPen::GetStyle() on the initially invalid pen resulted in an
assert, so don't do it and test for pen validity explicitly.

Closes #13524.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-30 15:26:36 +00:00
Vadim Zeitlin
2cf6960074 Create setup.h when building wxscintilla library.
This library includes some wx headers and so setup.h must be available when
it's being compiled but there was no rule to copy it in its projects, so add
it now.

Closes #13526.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-30 15:26:31 +00:00
Jouk Jansen
df016fc87e updates for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-30 14:00:52 +00:00
Jouk Jansen
829fa97b52 Update OpenVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-30 06:05:00 +00:00
Jouk Jansen
e2d313d19d Update setup fort OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 14:19:09 +00:00
Jouk Jansen
e26aff5636 Fixes for OpenVMS on IA64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 13:47:38 +00:00
Vadim Zeitlin
6b9103c67b Added XRC handler for wxTimePickerCtrl.
Add a trivial handler modeled after the existing wxDateCtrlXmlHandler.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 13:43:23 +00:00
Vadim Zeitlin
569c7d8ccb Add wxTimePickerCtrl class.
Implement wxTimePickerCtrl natively for MSW and add a generic implementation
(very loosely based on the original class by Paul Breen) for the other
platforms.

Also update the calendar sample to show the new control.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 13:43:15 +00:00
Vadim Zeitlin
1319b2684f Correct wxDatePickerCtrl::GetValue() documentation and other minor fixes.
The documentation for this method seems to have been copy-and-pasted from
somewhere else and didn't make any sense.

Also don't say that this control doesn't have any control-specific styles when
it does.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 13:43:05 +00:00
Vadim Zeitlin
8957e55ed3 Refactor wxDatePickerCtrl to derive from wxDateTimePickerCtrl.
No real changes, just refactor wxMSW wxDatePickerCtrl to allow sharing code
with the upcoming wxTimePickerCtrl class. Even less changes for the other
platforms where wxDateTimePickerCtrl is trivial.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 13:43:02 +00:00
Vadim Zeitlin
276f3938c4 VC6 compilation fixes for wxTreeListCtrl.
For some reason comparing wxTreeListItem with its associated Type doesn't work
when using VC6 ("error C2593: 'operator ==' is ambiguous") so help the compiler
to do it.

Also remove the unnecessary (and unsupported by VC6) return from void function.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 12:29:38 +00:00
Julian Smart
423b9ba554 Fixed caret sizing problem around large objects by clipping the caret to the margins
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 12:05:21 +00:00
Robin Dunn
82614b1a72 Don't always use the Cairo context for wxGCDC(wxMemoryDC). If a Cairo context is wanted then the wxGCDC(wxGraphicsContext*) ctor should be used instead. (I thought I had removed this code with my last commit of this file...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 07:28:04 +00:00
Steve Lamerton
7892e035c9 Delete the menu on close in the wxWebView sample. Fixes most of the memory leaks.
See #13500

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-28 19:44:35 +00:00
Steve Lamerton
e924e848f7 Fix compilation of wxWebView under mingw by adding missing definitions and dynamically loading urlmon.
Fixes #13509

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-28 14:54:56 +00:00
Jouk Jansen
5223261db4 correcting typo in previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-28 09:46:02 +00:00
Jouk Jansen
eec4d3f513 Include support for OpenVMS IA64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-28 06:02:21 +00:00
Stefan Csomor
0068a2c499 giving in on native undo integration, as we don't have a NSUndoManager, fixes #13431
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-27 07:21:44 +00:00
Jouk Jansen
1f11ce5b66 Correcting typo in commit 69203
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-27 07:14:49 +00:00
Jouk Jansen
afd474aea4 Update openVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-27 05:56:37 +00:00
Robin Dunn
ea8fa3c4e6 More interface updates for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-27 03:34:29 +00:00
Jouk Jansen
e38e588581 Disable webview on OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-26 14:28:32 +00:00
Václav Slavík
e9eda14ca6 Don't use install -d to create directories.
Always use `mkdir -p`, as install is problematic with regard to
permissions.

Fixes #13452.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-25 15:48:50 +00:00
Stefan Csomor
829c8572da adding missing autorelease pool, since this can be called from anywhere, fixes #13449
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-25 12:14:52 +00:00
Robin Dunn
6e350141f1 Fix missing or broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-25 04:30:49 +00:00
Vadim Zeitlin
87d2c6f507 Add support for handling new multi-arch under Debian.
The libraries are now in /usr/lib/arch-linux-gnu and not /usr/lib{32,64} so
check for them there too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-23 22:33:17 +00:00
Vadim Zeitlin
88cb53908a Fix inconsistent DLL export declaration for wxBannerWindowNameStr too.
This variable is defined in "adv" library, not "core".

This is similar to the fix of r69184.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-23 12:15:58 +00:00
Vadim Zeitlin
6de6ca4c74 Fix inconsistent DLL export declaration for wxTreeListCtrlNameStr.
This variable is defined in "adv" library, not "core".

See #13502.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-22 12:53:47 +00:00
Vadim Zeitlin
e427c04537 Improve appearance of wxTreeListCtrl during live resizing.
When using the generic wxDataViewCtrl version, forcefully refresh it after
changing its size to avoid artefacts during resizing of wxTreeListCtrl.

Closes #13502.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-22 10:36:01 +00:00
Vadim Zeitlin
6b719a1c09 Always give all the remaining space to the first wxTreeListCtrl column.
Under GTK the columns of wxDataViewCtrl (and hence wxTreeListCtrl) are always
resized to cover the entire control width. For consistency, also do it under
the other platforms and give the remaining space to the first column and not
to the last one as GTK does by default, as the first column is more important.

Do this even if this results in reducing the size of the column: presumably,
if the entire control itself can be resized, the user wouldn't bother resizing
the columns and, on the contrary, if the user did resize the columns, the
entire control size is unlikely to change, so in practice we don't risk
overriding the user preferences and reducing as well as increasing the first
column width works much better by default as it doesn't leave the other
columns invisible after making the control wider and than reverting it back to
its initial, more narrow, state again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-22 10:35:58 +00:00
Vadim Zeitlin
7d0cf3f9be Fix scrolling in small wxVListBox with tall items.
Scrolling in a small wxVListBox with tall items (i.e. taller than the height
of wxVListBox itself) behaved wrongly: wrong item was being scrolled into view
and Page Up/Down didn't scroll as much as they should.

Fix both of these problems by checking for these corner cases explicitly.

Closes #13454.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:08:10 +00:00
Vadim Zeitlin
d7b3992a5f Replace erroneous comma with a semicolon in keyboard sample.
Fix typo in the sample, comma was used instead of a semicolon. The code still
worked correctly but make it look correctly too now.

Closes #13453.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:08:06 +00:00
Vadim Zeitlin
c559c4b3ef Change wxSound ctor from in-memory data to use size_t/void *.
This constructor previously used int and, especially annoyingly, wxByte* for
the data. Use standard void* for untyped binary data instead.

Also document this ctor as it seems to be implemented in all ports.

Closes #13451.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:08:02 +00:00
Vadim Zeitlin
7ed24cb652 Send EVT_DATAVIEW_ITEM_CONTEXT_MENU events even when not clicking on an item.
Always send this event, even if the user right clicked outside of the client
area. This is useful for showing item-independent commands in the context
menu.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:07:56 +00:00
Vadim Zeitlin
da2e758f83 Implement sorting in wxTreeListCtrl.
Allow the user to sort the control contents by clicking on the columns with
wxCOL_SORTABLE flag and also provide SetSortColumn() method to sort the
control programmatically.

Also add wxTreeListItemComparator class and SetItemComparator() method to
allow customizing the way the items are compared.

Update the sample to show how to define a custom comparator.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:07:53 +00:00
Vadim Zeitlin
15b8afdcb8 Reset previous sort column in generic wxDataViewColumn::SetSortOrder().
The sort indicator on the column previously used for sorting was only reset
when the user clicked on the column header (by wxDataViewHeaderWindow code
that explicitly called wxDataViewCtrl::SetSortingColumnIndex()) but not when
wxDataViewCtrl::SetSortOrder() was called directly.

Fix this and take care of updating everything in SetSortOrder() itself. This
makes the code simpler and also means that calling SetSortOrder() from the
program now works as expected (it resulted in having sort indicators in two
columns at once before).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:07:49 +00:00
Vadim Zeitlin
aadbdd1699 Remove wxHeaderColumn::SetAsSortKey() and only use SetSortOrder().
The two member functions, SetAsSortKey() and SetSortOrder(), were doing almost
the same thing but differently and the former was only used in the generic
wxDataViewCtrl implementation and not implemented in the native GTK/OS X one.

Remove SetAsSortKey() entirely and only keep UnsetAsSortKey() which is still
needed by generic/MSW wxDataViewCtrl. But only SetSortOrder() should now be
called to indicate that the column is used for sorting.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:07:46 +00:00
Vadim Zeitlin
8148ae02ef Add wxTreeListCtrl::GetView() and GetDataView().
It can be useful to have access to the window used to actually show the items
by wxTreeListCtrl, provide two accessors for m_view: a wxDataViewCtrl-specific
one and a generic one returning just a wxWindow that can be used to keep the
code isolated from wxDataViewCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:07:41 +00:00
Vadim Zeitlin
b83d8f7339 Don't limit window size to (0, 0) in wxSizer if getting display size failed.
It's possible that wxDisplay::GetClientArea() returns (0, 0) size indicating
that it failed. Don't set the maximal window size to (0, 0) in this case as
this prevents the user from seeing the window at all and just don't do
anything instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:07:37 +00:00
Vadim Zeitlin
ad6f09f543 Refresh wxDisplay when a monitor is added to or removed from the system.
If a monitor was attached or detached while a wx program was running, the
monitor handles stored in wxDisplayFactoryMSW became invalid and all display
operations (e.g. getting display size) failed from this moment onwards
requiring a program restart to work again.

Fix this by updating the monitor handles when we get WM_SETTINGCHANGE as it is
sent when a monitor is added or removed (while it's also sent in quite a few
other cases re-enumerating the monitors shouldn't take very long so just do it
always).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:07:35 +00:00
Vadim Zeitlin
b481194f51 No changes, just extract wxCreateHiddenWindow() declaration in a header.
Add wx/msw/private/hiddenwin.h with wxCreateHiddenWindow() declaration instead
of declaring it manually in all the files using it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-21 15:07:32 +00:00
Julian Smart
23a9a87c85 Remove pointless case insensitivity
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-20 20:03:42 +00:00
Vadim Zeitlin
1841f0790d Add GetExpanderColumnOrFirstOne() to avoid code duplication in generic wxDVC.
There were two strictly identical code snippets setting the expander column to
be the first one if it hadn't been set before, replace both of them with a
call to GetExpanderColumnOrFirstOne() function.

Also use this function instead of just GetExpanderColumn() (which might return
NULL) in a couple of places.

Notice that there are still a lot of places in the code where the column 0 is
hard coded as being the expander column, this would need to be fixed to really
support non-first expander column.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-20 18:37:11 +00:00
Vadim Zeitlin
42cbde5162 Reset the expander column when clearing columns in generic wxDVC.
The expander column becomes invalid when all columns are cleared, don't keep
a dangling pointer.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-20 18:37:08 +00:00
Michael Wetherell
4fcffaf066 Move ravnsgaards build to brandt32 while its down.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-20 17:25:55 +00:00
Vadim Zeitlin
c5512cab0f Minor fixes to code examples in wxPropertyGrid documentation.
Fix typo in wxPGProperty name and add missing parameter of GetVIterator()
call.

Closes #13486.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-18 20:28:37 +00:00
Vadim Zeitlin
4cbe0dd816 Fix test for wxUSE_TREELISTCTRL in configure.
wxUSE_TREECTRL was wrongly used instead.

Closes #13470.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-18 20:26:38 +00:00
Robin Dunn
ba4f890e49 FIx broken or missing interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-18 04:38:01 +00:00
Vadim Zeitlin
5c79993559 Fix format specifiers used for "unsigned long" in wxPG code.
"unsigned long" quantities must be formatted using "%l[xou]" and not just
"%[xou]" as the latter doesn't work correctly on 64 bit platforms.

Closes #13447.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 11:06:15 +00:00
Vadim Zeitlin
32a925f832 Change wxDIALOG_NO_PARENT to avoid clash with wxICON_EXCLAMATION.
Use 0x20 (wxAPPLY) instead of 0x100 (wxICON_EXCLAMATION) for
wxDIALOG_NO_PARENT as otherwise using wxICON_EXCLAMATION with wxMessageBox in
wxGTK (and possibly other ports, although not wxMSW which doesn't honour
wxDIALOG_NO_PARENT for message boxes at all) resulted in not using the
specified parent for the message box and, as a side effect, not centering it
on its parent neither.

Closes #13464.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 11:06:11 +00:00
Vadim Zeitlin
f8ec7b81b2 Add wxUSE_TREELISTCTRL checks to treelist.cpp itself.
The contents of this file was still compiled even when wxUSE_TREELISTCTRL was
turned off. Fix this by adding the missing "#if wxUSE_TREELISTCTRL" check
around it.

Closes #13470.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 11:06:05 +00:00
Vadim Zeitlin
6ab3e0396c Fix the library of wxGenericDirCtrl in the documentation.
Closes #13482.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 11:06:01 +00:00
Vadim Zeitlin
88cc66f72d Only define wxUSE_WEBVIEW if wxWebView is really available.
Don't define wxUSE_WEBVIEW in configure if WebKit is not available under Unix
(we should also check for wxUSE_WEBVIEW_IE under Windows later) and add the
check that either wxUSE_WEBVIEW_WEBKIT or wxUSE_WEBVIEW_IE is defined if
wxUSE_WEBVIEW is to wx/chkconf.h.

This makes it possible to just check for wxUSE_WEBVIEW instead of checking for
wxUSE_WEBVIEW && (wxUSE_WEBVIEW_IE || wxUSE_WEBVIEW_WEBKIT) as the code did
previously which was ugly and error-prone.

Also, define wxUSE_WEBVIEW_IE in configure under MSW. Currently this supposes
that the required IE headers/libraries are available which is probably wrong,
we should add checks for them later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 22:44:17 +00:00
Vadim Zeitlin
32cc8d13b8 Check for wxUSE_WEBVIEW being defined.
All wxUSE_XXX options must be always defined as we test for them with #if and
not #ifdef, so check for this one too for consistency.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 22:44:11 +00:00
Vadim Zeitlin
792339b963 Fix wxFont::GetFaceName() for not realized yet fonts in wxMSW.
GetFaceName() could be called for a font that hadn't been really used yet and
hence its wxFontRefData::m_hFont could be 0 and couldn't be used in
GetMSWFaceName().

Fix this by using GetHFONT() accessor instead of m_hFont directly to create
the font if necessary.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 22:44:04 +00:00
Robin Dunn
e932127792 fixes for missing or broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 17:03:01 +00:00
Vadim Zeitlin
e23e368bc4 Fix int field of wxCommandEvents generated by menu items in wxMSW.
Set the int field of wxCommandEvent generated by clicking on the menu items
correctly for not checkable items: it is supposed to be -1 and not 0 (which is
the value for checkable but currently unchecked items). This was already the
case for wxGTK and wxOSX and implied by the comments in the code.

Make wxMSW behave like this too and clearly document this behaviour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 13:23:14 +00:00
Vadim Zeitlin
99893e284f Fix int field of wxCommandEvent generated by popup menu items in wxMSW.
The intention of the code generating the event for popup menu items was to
pass false (0) or true (1) in the int field of wxCommandEvent to indicate
whether the item was checked or not but, because wxMenu::SendEvent() takes int
as second argument and not book, we passed either 0 or MF_CHECKED (== 8).

Fix this by correctly passing a boolean for checkable items.

See #11644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 13:23:10 +00:00
Vadim Zeitlin
3f8502f7fc Fix checked state for the popup menu items in the events generated by them.
We incorrectly passed the sign-extended int id to ::GetMenuState() function
that expects an unsigned WORD id, so it never found the item if the WORD id
had the high bit set. Fix this by correctly passing the unsigned id to it.

Closes #11644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 13:23:05 +00:00
Stefan Csomor
7aab7c77f4 reverting change, for precompiled headers, unfortunately this means that WXROOT must not contain spaces unless properly escaped
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-15 19:05:06 +00:00
Jouk Jansen
d2758163a9 Repair compile sequenze for wxGTK on OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-15 14:25:50 +00:00
Steve Lamerton
882ecaa631 Use integral value for OLECMDID_OPTICAL_ZOOM as we cannot tell if an enum value is already defined or not.
Fixes #13475

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 16:45:50 +00:00
Steve Lamerton
8240dea400 Update configure to only define wxUSE_WEBVIEW_WEBKIT if all the required components are available.
Fixes #13474

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 14:03:34 +00:00
Steve Lamerton
4794f127cd Cause a compile time error in the wxWebView sample if no backend exists.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 12:39:30 +00:00
Steve Lamerton
c78da4eb62 Make wxBookCtrlBase::GetSelection virtual, as per the documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 08:24:06 +00:00
Steve Lamerton
30e2c04682 Only build the wxWebView tests if there is an available backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 07:39:28 +00:00
Steve Lamerton
d04f535c7e Correctly disable webkit backend if the appropriate headers cannot be found.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-13 21:26:41 +00:00
Steve Lamerton
6edb39127b Correct a typo in the wxWebView tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-13 19:39:38 +00:00
Steve Lamerton
af5fccc140 Disable webkit backend if the appropriate headers cannot be found.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-13 12:06:06 +00:00
Steve Lamerton
9d2f31db0c Update wxWebView guards to stop backend compilation when wxUSE_WEBVIEW is 0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 18:35:39 +00:00
Steve Lamerton
96ceb55625 Ensure that we have an available backend for wxWebView compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 13:42:30 +00:00
Jouk Jansen
b175dd2c5b Update setup for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 11:13:05 +00:00
Jouk Jansen
821c2a3750 add compile support for thread sample on OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 10:57:44 +00:00
Václav Slavík
5c65a66151 Fix appending of non-leaf node to wxGTK's wxDataViewCtrl.
This was accidentally broken in r68965: appending a branch node after
all others node resulted in corruption of m_nodes, as the node was never
added to the list.

Fixes #13467.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 09:23:59 +00:00
Stefan Csomor
b5f035b37a supporting spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 07:12:27 +00:00
Vadim Zeitlin
df0419d21d Fix best size computation for wxTextCtrl without borders in wxMSW.
wxTextCtrl with wxBORDER_NONE (and possibly wxTE_READONLY) style is often used
instead of a wxStaticText to allow copying the text, so make the size of such
control the same as size of the label. This ensures that it aligns correctly
with the label vertically while before the baselines were not aligned because
a border-less text control was rendered by MSW as a label but had a too big
size.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 21:55:47 +00:00
Steve Lamerton
7011055c55 Ensure that we have an available backend for wxWebView compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 13:26:24 +00:00
Vadim Zeitlin
e657c460a3 Still resize wxSplitterWindow children even when sash position doesn't change.
Since the changes if r68876, the splitter windows were not resized correctly
if the splitter size in the direction orthogonal to its own didn't change.
This was an unintended side effect of the changes in that commit as it only
wanted to avoid calling SetSashPositionAndNotify() in this case, but
SizeWindows() should still be called.

Ensure that we do call it always from wxSplitterWindow::OnSize() to fix this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 11:27:17 +00:00
Vadim Zeitlin
b550ad2aec Regenerate configure after webview branch merge.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 10:55:03 +00:00
Steve Lamerton
d60b34a413 Update setup files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 10:15:28 +00:00
Steve Lamerton
92b4653a62 Rebake trunk after wxWebView merge and add missing project files for the wxWebView library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 10:12:19 +00:00
Robin Dunn
86381d4297 Fix missing and broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 00:35:32 +00:00
Steve Lamerton
b2b31b87fb Merge the new wxWebView classes from the SOC2011_WEBVIEW branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-10 18:09:12 +00:00
Paul Cornett
1ddb3b55b0 update WarpPointer for GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-10 16:02:59 +00:00
Steve Lamerton
1d156af324 Merge in from trunk r68684 - r69046
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@69047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-10 15:09:22 +00:00
Robin Dunn
01bd848eb9 Enable the HWND of the task dialog to be fetched with GetHandle if it is being used.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-10 03:26:37 +00:00
Vadim Zeitlin
1a66177951 Allow setting colours and font of wxTreeListCtrl.
Use wxCompositeWindow<> to propagate changes of colours and font to
wxDataViewCtrl that wxTreeListCtrl uses internally.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-08 21:15:24 +00:00
Paul Cornett
f06efcfd66 non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-07 16:57:42 +00:00
Paul Cornett
29e461a210 remove unnecessary GTK declarations from defs.h, move things only used once to the place that needs them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-07 16:56:50 +00:00
Paul Cornett
fb6e5bff0e move addition of -lX11 to better place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 16:35:53 +00:00
Paul Cornett
527479c46e don't disable cast checks in debug builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 16:24:49 +00:00
Paul Cornett
b454750571 remove unused __WXGTK12__ symbol
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 16:09:51 +00:00
Paul Cornett
89761a49d1 remove (very) obsolete GTK version check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 15:54:12 +00:00
Robin Dunn
ea76345f0f fix for non-pch builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 04:17:44 +00:00
Robin Dunn
4f8870e337 Avoid infinite recursion on Mac in comboctrl, and fix an uninitialized pointer in propgrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-05 20:08:04 +00:00
Václav Slavík
76b92fa5c7 Fix crash in wxDataViewCtrl::UpdateColWidths().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-05 15:40:56 +00:00
Václav Slavík
a027a36f2c wxDataViewCtrl: enable F2 editing with multiple selection too.
This matches the native (and thus expected) behavior of Windows
Explorer: edit the first item in selection. It's also better than
ignoring user's key presses.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-05 14:25:31 +00:00
Vadim Zeitlin
d6397a9f35 Add persistence support for wxSplitterWindow.
New wxPersistentSplitter class allows to easily save and restore the splitter
position in config.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-04 23:01:45 +00:00
Stefan Csomor
8f2139d0d8 setting the image position after the label is set, otherwise image_only will have the potential label over the image
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 16:19:28 +00:00
Václav Slavík
857f05e1bf Use ProcessWindowEvent() in generic wxDataViewCtrl code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 13:14:31 +00:00
Václav Slavík
cfc2188189 Extracted wxDataViewMainWindow left/right keys handling into separate methods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 13:14:28 +00:00
Václav Slavík
1dc779fc6c Rename wxDataViewMainWindow::OnArrowChar to OnVerticalNavigation.
The method handled much more than just arrow characters and it didn't
handle all arrow characters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 13:14:25 +00:00
Václav Slavík
2c336e249e Slightly more efficient wxDataViewCtrl::StartEditor().
Don't compute item rect until we know for sure that the item actually is
editable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 13:14:23 +00:00
Václav Slavík
c2efa4b48a Fix generic wxDataViewCtrl Enter handling to conform to Windows UI.
Spacebar is used to activate columns (e.g. toggle a checkbox).  Enter
activates the item, i.e. sends wxEVT_COMMAND_ITEM_ACTIVATED. If that
event isn't handled, Enter acts the same as Space.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 13:14:20 +00:00
Robin Dunn
8ff9b17d57 Fix some broken or add some missing interface declarations for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-03 01:39:02 +00:00
Vadim Zeitlin
c2d4ceaf57 Don't warn about wxMetaFile in configure by default.
Only warn if an explicit --enable-metafile was given, otherwise just turn it
on only for the platforms that do support it, similarly to what was done for
--enable-hotkey in the previous commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-01 18:43:07 +00:00
Vadim Zeitlin
97e477c557 Add wxUSE_HOTKEY support to configure.
Add --enable-hotkey switch to allow enabling hot keys support and enable it by
default under MSW and OS X that do support them but disable it elsewhere to
avoid unnecessary warnings about them being unsupported.

See #12354.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-01 18:43:03 +00:00
Stefan Csomor
b8702c673a fixes #13443, thanks :-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-01 16:20:24 +00:00
Vadim Zeitlin
2bad2b6d60 Fix deleting and clearing wxTreeListCtrl columns.
The model columns were not updated before, resulting in a mismatch between
view and model columns if ClearColumns() followed by AppendColumn() was
called.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-31 17:22:11 +00:00
Václav Slavík
35219832c9 Add items to correct position in wxDataViewCtrl:ItemAdded.
In both the generic and GTK+ versions, ItemAdded() always appended the
new item, regardless of its position among its siblings  in the model.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-31 09:36:27 +00:00
Václav Slavík
bed74e488f Generic wxDataViewCtrl: resize autosized columns at idle time.
This is much more efficient than doing it immediately when adding large
number of items into a control with lots of them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-31 09:04:41 +00:00
Dimitri Schoolwerth
685a9fa61d Fixed dlmsw.cpp compilation with older SDKs and at run-time for systems prior to XP SP1.
Kernel32's SetDllDirectory is only available since XP SP1 and as such also not available in the SDK that comes by default with for example VS6. Attempt to retrieve the function from the DLL at run-time instead. Regression since r68935.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-30 15:20:05 +00:00
Vadim Zeitlin
2669319136 Better support for flat lists in wxTreeListCtrl.
Override wxDataViewModel::IsListModel() to return true if wxTreeListCtrl
doesn't have any depth. This results in better display when using the generic
implementation of wxDataViewCtrl as no space is reserved for the (unnecessary)
expanders in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-30 13:40:44 +00:00
Vadim Zeitlin
c46ecbe3b5 Fix computation of the item offset in generic wxDataViewCtrl code.
We need to account for the expander even for the items that don't have
children when computing their offset as their parent still does have it,
contributing to the total offset.

This corrects the fixes of r68836 to also work for the leaf items.

Also rename expanderOffset variable to more clear itemOffset.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-30 13:40:40 +00:00
Jouk Jansen
179dbf40de Update makefiles for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-30 09:51:21 +00:00
Stefan Csomor
8b14528f7b fixes #13438 (building OSX min >= 10.6), thanks :-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-30 09:02:11 +00:00
Stefan Csomor
eb3cb4925c adding command - comma as shortcut of stockitem wxID_PRERENCES on OSX - and make sure it's working by adapting ToString()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-30 07:01:25 +00:00
Dimitri Schoolwerth
eb5502dcaa Regenerated Xcode projects.
Updated the Xcode projects to include latest source additions and newer settings from template *_in.xcodeproj project files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-29 19:09:16 +00:00
Václav Slavík
77b555c2a4 Send wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED if WXOnActivate() returned false too.
This is consistent with wxGTK implementation and generally makes sense:
when the renderer cannot handle activation, whole-item activation should
be tried next.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-29 17:25:38 +00:00
Václav Slavík
297e2532b1 Make generic wxDataViewToggleRenderer react to activation.
Previously it only responded to single-clicks, which was to avoid the
need to double-click checkboxes. Fixed to react to activation via
double-click or keyboard too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-29 17:25:33 +00:00
Václav Slavík
276227fcbb Activate cells from keyboard too in generic wxDataViewCtrl.
wxDataViewCtrl only called WXOnActivate() in reaction to double-click.
When Enter/Spacebar was pressed, only
wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED was sent, without calling
OnActivate() even if it was possible.

Fixed to handle both kinds of input identically.

Because there's currently no way to change current focus to a particular
column (as GtkTreeView can do), call WXOnActivate() on the first
activatable column.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-29 17:25:25 +00:00
Dimitri Schoolwerth
07968bbdc5 Fixed drawing a check box in the undetermined state for non-themed MSW apps.
wxRendererMSW::DoDrawFrameControl (used for systems prior to XP or when theming is disabled) didn't check for the wxCONTROL_UNDETERMINED flag yet. Set the appropriate styles when the flag is used to fix drawing check boxes in their third state (as used in for example the treelist sample).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-29 16:06:32 +00:00
Vadim Zeitlin
513d05952a Make it possible to TAB to wxTreeListCtrl contents.
Even though wxTreeListCtrl contains just one child window it still needs to
derive from wxNavigationEnabled<> to allow focus getting to its sole child.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-29 14:46:56 +00:00
Vadim Zeitlin
758cdca10a Fix spelling error in an error message in wxObjectXmlReader.
No other changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-29 12:33:40 +00:00
Dimitri Schoolwerth
ab176b4b50 Added alpha saving support to TIFF image handler.
Added support for saving alpha with RGB, greyscale, and black and white images.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-29 01:13:06 +00:00
Dimitri Schoolwerth
ebbaec82fa Fixed loading greyscale with alpha TIFF images.
The alpha channel was not detected because of wrong hasAlpha determination. Also TIFFReadRGBAImage[Oriented] doesn't appear to decode an alpha channel for images that are greyscale so decode greyscale with alpha images using TIFFReadScanline.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 23:45:17 +00:00
Dimitri Schoolwerth
a000de7794 Fixed copying only 1/3 of scanline when saving TIFF image in rare cases.
If our calculated image pitch is not equal to what TIFFScanlineSize returns a scanline buffer would be used. In that case the number of bytes being copied was equal to the image's width instead of pitch (width times 3).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 22:44:04 +00:00
Dimitri Schoolwerth
f60e313437 Added support for loading black and white TIFF images with alpha.
As TIFFReadRGBAImage[Oriented] can't deal with all images make use of TIFFReadScanline to decode per scanline. Currently only the case of a black and white image with alpha (for a total of 2 bits per pixel) is handled.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 22:17:04 +00:00
Dimitri Schoolwerth
d6d29abb44 Updated manual regarding image alpha support for TGA handler.
TGA was not mentioned in the list of formats supporting loading of alpha, but alpha loading support has been available since r42644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 22:06:46 +00:00
Dimitri Schoolwerth
5d2be7cc55 Read TIFF images from top to bottom instead of bottom to top.
Use TIFFReadRGBAImageOriented with a parameter of ORIENTATION_TOPLEFT instead of using TIFFReadRGBAImage (which uses ORIENTATION_BOTTOMLEFT) to read images in a more logical order and simplify code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 21:59:36 +00:00
Dimitri Schoolwerth
f2de33ede4 Fixed accessing out-of-bounds image coordinates while writing a black and white TIFF image.
The code assumed that the image's width is a multiple of 8, and attempted to always write per 8 pixels instead of sometimes having to write fewer pixels for the last column.

Also fixed compilo from previous commit due to not removing old code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 21:49:28 +00:00
Dimitri Schoolwerth
649df4bff8 Fixed calculated image pitch being off-by-one in some cases.
The variable linebytes sometimes counted one extra byte, which is OK for allocating but not when accessing the image later on. Calculate the value in a slightly different way and made the variable const.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 21:38:22 +00:00
Dimitri Schoolwerth
28b31a2ad2 Removed double TIFFSetField call for setting TIFFTAG_ORIENTATION.
Setting the same TIFF tag with the same value once is enough.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 21:31:59 +00:00
Dimitri Schoolwerth
c6973babc6 Call GetAlpha() to get a pointer instead of checking for alpha first.
It's safe to call GetAlpha() even if there's no alpha because in that case NULL will be returned.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 21:27:34 +00:00
Stefan Csomor
2824962c5a make sure svn info for an already existing .xcodeproj folder is not deleted, replace project file itself in place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 13:00:38 +00:00
Stefan Csomor
1aa1d260b5 adding missing doc string for BACKSPACE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 07:11:44 +00:00
Stefan Csomor
99d6720118 routing keys like ESC etc, fixes #13429
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-28 06:54:18 +00:00
Robin Dunn
932d0768aa * Implement dynamic loading of the Cairo DLL on Windows similar to how it was
done for GDI+.

* Enable the use of the wxCairoContext on MSW.

* Enable creating a wxGCDC from an exisiting wxGraphicsContext.

* Since it's possible for a DLL that is using wx to not be on the PATH nor in
  the same location as the .exe, change the wxDynamicLibrary::RawLoad method to
  explicitly look first in the same place as the main wx-using binary.  This way
  it will find DLLs that are in the same folder as the wx-using binary even if
  that would not be in the normal DLL search path.  

* Change wxDCImpl and wxDC::GetLogicalScale to be const methods.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 23:26:53 +00:00
Václav Slavík
d54f0605a9 More understandable symbolic constants in generic wxDVC's DoJob class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 16:44:47 +00:00
Václav Slavík
e1f30123c9 Use spacebar to activate items in generic wxDataViewCtrl too.
Pressing Spacebar now behaves the same as Enter in the generic control,
for consistency with the GTK+ control and native Windows list controls.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 16:44:45 +00:00
Václav Slavík
a2d3c415d7 Remove DestroyTreeHelper(), make GetChildNodes() const, add RemoveChild().
There's no reason for DestroyTreeHelper() code, that's what destructors
are for.  On a related note, make removal of children from a node more
explicit too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 16:44:42 +00:00
Václav Slavík
c2c89730e2 Add wxDataViewMainWindow::GetModel() helper.
It's slightly less verbose than GetOwner()->GetModel() used all
over the place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 16:44:39 +00:00
Václav Slavík
ff3c5ad3d3 Better names in wxDataViewTreeNode.
GetChildNodes() instead of GetNodes(), AddChild() instead of AddNode().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 16:44:36 +00:00
Václav Slavík
dd90475f71 Use wxTE_PROCESS_ENTER with wxDataViewCtrl text controls.
wxDVC code depends on wxEVT_COMMAND_TEXT_ENTER to hide the
inline editing controls.

Fixes #13412.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 15:23:43 +00:00
Vadim Zeitlin
d5d0f0cd9a No real changes, minor corrections to the docs.
Don't leave a line break inside a @code block as it's preserved in the HTML
output, making it appear ugly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:58:43 +00:00
Vadim Zeitlin
686631c665 Copy generic images when building the documentation too.
The images used by @genericAppearance Doxygen macro were not copied to the
output directory.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:56:33 +00:00
Vadim Zeitlin
00fa267c1e Compilation fix for wxTreeListCtrl when not using PCH.
Include wx/dc.h normally included from wx/wxprec.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:50:01 +00:00
Vadim Zeitlin
211d331379 No changes, just fix the file name in the header comment of wxDVC test.
s/tree/dataview/

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:11:31 +00:00
Vadim Zeitlin
b18ebec956 Make wxBU_EXACTFIT fir the button text more exactly.
Too big margins were added for the buttons with wxBU_EXACTFIT style making
them larger than strictly necessary. Reduce the margins to make them really
as small as possible.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:11:28 +00:00
Vadim Zeitlin
75bc8b3454 Added wxFLP_SMALL and wxDIRP_SMALL styles for wx{File,Dir}PickerCtrl.
These styles allow to use a smaller browse button as the standard one takes
too much space, often leaving too little of it for the more important text
control part.

Notice that both styles are, in fact, equal to wxPB_SMALL but only file and
directory pickers currently use it as it doesn't make sense for the colour and
font pickers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:11:25 +00:00
Vadim Zeitlin
ea7ff9ad2a Auto complete file names in the text controls of wx{File,Dir}PickerCtrl.
There doesn't seem to be any reason not to do this in the controls which we
know are meant for entering file or directory names into them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:11:20 +00:00
Vadim Zeitlin
9a995b1a42 Make the file and dir picket controls expand in widgets sample.
The controls were too small to see long paths in them comfortably while there
was plenty of space in the page, use wxEXPAND flag for them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:11:17 +00:00
Vadim Zeitlin
03dede4dc1 Add wxTextEntry::AutoCompleteDirectories().
As we already had MSW-specific AutoCompleteFileNames(), we can just as well
also add the also useful AutoCompleteDirectories() to be used with the text
controls used for path entry.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:11:13 +00:00
Vadim Zeitlin
d50fc4dc6d No changes, just fix a typo in wxBannerWindow documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:11:09 +00:00
Vadim Zeitlin
524cb04066 Add new wxTreeListCtrl class.
This is a facade for wxDataViewCtrl allowing to easily work with multi-column
trees, possibly with an optional checkbox in the first column. Its API is very
similar to wxTreeListCtrl and it provides a simple migration path from the
latter.

Add the class itself, documentation for it and minimal unit tests.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 14:11:03 +00:00
Václav Slavík
15d1fd3f6f Notify GtkTreeView if a node stops being a parent.
GtkTreeView requires the row-has-child-toggled signal to be emitted in
this situation, so do it from ItemDeleted handler.

Curiously, it handles adding the first child automatically. That's good,
because detecting this situation when adding the first child wouldn't be
trivial and so not having to do it is a plus. (Emitting it on every node
addition doesn't sound like a terribly bright idea.)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 13:24:25 +00:00
Václav Slavík
d0cfefc4e0 Save memory in wxDataViewTreeNode.
Put data that are meaningful only for non-leaf nodes into a separate
struct that is only allocated for branch nodes. This makes branch
nodes larger by sizeof(void*), but leaf nodes save >50% of memory.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 13:24:22 +00:00
Václav Slavík
422aa8ecfe Simplified generic wxDataViewCtrl's tree structure.
Use just one type, wxDataViewTreeNode, to represent any kind of node.
Previously a complicated structure that represented leaves and non-leaf
nodes differently was used. This make the code way too complicated and
caused some smaller bugs (see e.g. #13256).

As a side effect, this change makes the control react correctly to
changes in IsContainer() return values.

Also fixes #13256.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 13:24:19 +00:00
Václav Slavík
b632efe0d6 No real change, use more descriptive variable names in wxDataViewMainWindow::ItemDeleted().
Call the node object corresponding to 'parent' 'parentNode' instead
of just the more vague 'node'. Also, 'nodes' instead of 'nds'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 13:24:07 +00:00
Vadim Zeitlin
35368572bc Set colours and fonts for all elements of the generic wxSearchCtrl.
Derive generic wxSearchCtrl from wxCompositeWindow<> to ensure that calls to
its Set{Fore,Back}groundColour() are propagated to all its children, otherwise
they applied only to the composite control itself but not e.g. its text part.

Also update the bitmaps when the background colour changes to ensure that it
appears as transparent.

Closes #13428.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 12:13:23 +00:00
Vadim Zeitlin
162e221f76 Allow returning NULL windows from GetCompositeWindowParts().
wxCompositeWindow::GetCompositeWindowParts() becomes simpler to implement in
the derived classes with optionally shown elements if NULL windows are allowed
(and ignored) in the list returned by it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 12:13:18 +00:00
Vadim Zeitlin
97f851007c Fixes to OpenGL samples to avoid asserts/crashes.
Don't call wxGLCanvas::SetCurrent() when the window is not shown.

Closes #13424.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 12:13:13 +00:00
Jouk Jansen
7f1b6179cd Update setup for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-26 13:01:40 +00:00
Dimitri Schoolwerth
b15dfd0895 Fixed best size of wxUniv's wxNotebook.
Removed wxNotebook::DoGetBestClientSize to let wxBookCtrlBase::DoGetBestSize do its job and fix the best size of a wxNotebook (formerly when running the notebook sample the notebook was not wide enough).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-25 23:32:05 +00:00
Dimitri Schoolwerth
b849473237 Fixed best sizes for wxUniv controls.
Many wxUniv controls had a way too small best size which was noticeable when running e.g. the widgets sample. Regression started in r61169 where wxWindowBase::DoGetClientBestSize() was introduced but that virtual function already existed in wxUniv's wxWindow. Removing wxUniv's wxWindow::DoGetBestSize and wxWindow::DoGetBestClientSize fixes sizing issues.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-25 23:16:44 +00:00
Dimitri Schoolwerth
82e1729555 Fixed width of scrollbars in wxUniv.
The AdjustSize renderer function for wxUniv's GTK and MSW theme adjusted the size of a scrollbar while it already had the correct size, resulting in scrollbars being twice as wide. Fixed by not adjusting the size of a scrollbar anymore in AdjustSize.

Closes #11660.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-25 23:13:00 +00:00
Dimitri Schoolwerth
f4308cf55f Fixed buttons having no border in wxUniv by default.
Buttons had a border of wxBORDER_NONE resulting in wxButton::DoDraw not drawing the button's border. Fixed by adding wxAnyButton::GetDefaultBorder() for wxUniv which returns wxBORDER_STATIC. Regression since r67931.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-25 23:09:00 +00:00
Dimitri Schoolwerth
fe62518e7c Fixed MSW/Univ compilation of toplevel.cpp.
MSW-only functions were compiled in, disabled their usage by adding #ifndef __WXUNIVERSAL__ blocks.

Closes #13399 (again, after r68723 already should have closed it but its commit message contained a typo).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-25 21:52:55 +00:00
Stefan Csomor
0e1d0c5373 mb:54153a12-b2c7-417e-b607-c4faa9c436ab
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-25 16:37:05 +00:00
Steve Lamerton
d4adec8361 Rebake after previous commit, should fix monolithic compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-24 12:57:28 +00:00
Vadim Zeitlin
8fcf7cd035 No real changes, just update copyright year in wxInfoMessageBox().
s/2010/2011/

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-24 11:52:57 +00:00
Vadim Zeitlin
aaa801d1dd Try harder to set the requester splitter position in wxSplitterWindow.
The code in wxSplitterWindow tried to remember the requested position and set
the real sash position to it later, even if the initial window size was too
small to allow for it, but it didn't work because the requested position was
forgotten after the first size event, even though it was quite possible that
this event didn't really change the window size from the initial, small, one.

Try to make this more robust by ignoring the size events which don't really
change the window size. Also set m_lastSize correctly initially.

Now setting the sash position does work even if the splitter itself is inside
nested sizers (which results in many size events).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-24 11:48:18 +00:00
Stefan Csomor
d3f81b8533 adding raw_control for osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-24 11:19:43 +00:00
Steve Lamerton
d26ae53f3d Remove out of date extralib stuff from the bakefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-24 07:43:12 +00:00
Stefan Csomor
4983b80d07 missing commit for RAW_CONTROL changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-24 06:14:10 +00:00
Stefan Csomor
84381ea472 missing commit for RAW_CONTROL changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-24 04:15:58 +00:00
Vadim Zeitlin
c66160d5d5 Compilation fix for non-OSX: don't use m_rawControlDown there.
m_rawControlDown is supposed to be only used under OS X so put an #ifdef
__WXOSX__ around it in wxKeyboardState::GetModifiers() to fix compilation
under the other platforms.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 15:44:04 +00:00
Stefan Csomor
68065b9194 fixing type for key event, using WXK_RAW_CONTROL constant for controlkey, see #13415
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 15:30:44 +00:00
Stefan Csomor
a8fc3508e7 exposing control key combinations as before, fixing unicodekey casing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 15:18:27 +00:00
Vadim Zeitlin
fd48fe892c Simplify checks for event vetoing in generic wxDataViewCtrl code.
Don't return the whole event object from SendExpanderEvent() just to check if
it wasn't vetoed, simply return a boolean value indicating if this was the
case from this function itself.

This makes it both more efficient and easier to use.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 15:11:25 +00:00
Vadim Zeitlin
d1a92cf322 Fix completely wrong logic for veto checking in generic wxDVC.
The code sending the event must check whether the event was vetoed or not, not
whether it was skipped or not. This is the minimal change resulting in correct
behaviour even if an event handler does skip the event.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 15:11:22 +00:00
Stefan Csomor
dd9ec5961f adjusting keyboardstate to new ctrl / raw_ctrl handling on osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 13:19:19 +00:00
Stefan Csomor
8b9e09383a adjusting keyboardstate to new ctrl / raw_ctrl handling on osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 13:03:52 +00:00
Vadim Zeitlin
71f89d85c3 Mention wxLocale in wxNumValidator documentation.
Using setlocale() can thoroughly confuse wxNumValidator because it results in
a mismatch between the decimal and/or thousands separators it uses, returned
by wxLocale, and the actual separators in the strings, formatted by the CRT.

So mention in the documentation that using setlocale() is a bad idea.

Closes #12970.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 11:04:44 +00:00
Vadim Zeitlin
bf92c2268e No changes, just add a missing comma in wxNumValidator documentation.
SetRange() declaration wasn't properly terminated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 11:04:41 +00:00
Vadim Zeitlin
0043f42027 Check for decimal separator inconsistency in wxLocale::GetInfo().
Under wxMSW it's possible to have mismatch between the CRT locale (used by
various printf-related functions) and the system locale (queried by
wxLocale::GetInfo()).

Warn if such a mismatch occurs and tell people to use wxLocale instead of just
setlocale() to change the locale.

See #12970.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 11:04:37 +00:00
Vadim Zeitlin
94ed214db2 Fix wxBannerWindowNameStr definition in DLL builds.
Don't use WXDLLEXPORT_DATA when defining the variable, it can be only used
when declaring it.

This fixes wxMSW DLL build with MSVC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 10:50:43 +00:00
Dimitri Schoolwerth
4ca8531f61 Added wxBITMAP_TYPE_TIFF and wxBITMAP_TYPE_TIFF_RESOURCE.
Having wxBITMAP_TYPE_TIFF and wxBITMAP_TYPE_TIFF_RESOURCE is more consistent with already using the complete short name of an image format elsewhere (e.g. wxBITMAP_TYPE_JPEG, not wxBTMAP_TYPE_JPG, and wxTIFFHandler as opposed to wxTIFHandler). Renamed all existing occurrences and kept the old enum values for backwards compatibility.

Also renamed occurrences of wxBITMAP_TYPE_RESOURCE to the already existing wxBITMAP_TYPE_BMP_RESOURCE.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 04:55:46 +00:00
Dimitri Schoolwerth
ca21c76b2a Fixed linking errors related to wxAnyButton in wxUniv.
Native wxAnyButton headers were being included but the sources aren't used in wxUniv. Fixed this by not including any native header in wxUniv and instead made wxAnyButton a typedef of wxAnyButtonBase.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 04:41:00 +00:00
Dimitri Schoolwerth
3f4880a451 Fixed compilation of various notebook.cpp's.
Make use of HasImageList() and GetImageList() instead of accessing the now private m_imageList directly. Fixed for wxUniv, wxGTK1, and wxOS2 (the latter 2 blindly). Changes are similar to r68856 and should have been a part of that.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 03:08:01 +00:00
Dimitri Schoolwerth
f340c9ca88 Fixed compilation of sources that make use of wx/univ/notebook.h.
wxUniv's wxNotebook was accessing m_imageList which now is a private in wxWithImages since r68809. Fixed by using wxWithImages::HasImageList.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-23 02:18:41 +00:00
Vadim Zeitlin
34532177aa Exclude another auto-generated file when cleaning the patches.
Changes to autoconf_inc.m4 are not interesting neither, exclude them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 15:35:47 +00:00
Vadim Zeitlin
b30ad9676b Don't refresh not yet realized widget in wxGTK wxDataViewCtrl.
If the text of any of wxDataViewCtrl cells was set before the control was
realized (e.g. during its creation), the code tried to refresh the not yet
shown widget resulting in GTK+ errors.

Avoid this by only refreshing the tree if it's realized.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 15:31:38 +00:00
Vadim Zeitlin
dbab29b925 Return non-const pointer from wxDataViewRendererBase::GetView().
Non-const wxWindow pointers are unfortunately needed quite often in wx API so
return a non-const pointer here to allow using it with e.g. wxRendererNative
(whose methods all take non-const wxWindow pointers) in the derived classes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 15:31:36 +00:00
Vadim Zeitlin
60d10101b7 Add wxDataViewIconText::IsSameAs() and make comparison operators members.
Add IsSameAs() to make it simpler to call from the derived class operator==()
implementation.

Also make comparison operators themselves members instead of global functions
to avoid considering them as matches for all operator==() uses in the program,
there is really no need for this as we do _not_ want to allow implicitly
converting something to wxDataViewIconText when comparing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 15:31:33 +00:00
Vadim Zeitlin
66d9eb612b Return (16,16) as the default list icons size in wxMSW.
The standard size of the small icons in list controls under MSW is
traditionally 16*16 so return this from wxMSW wxArtProvider.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 15:31:30 +00:00
Stefan Csomor
8b98275595 removing trailing comma
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 15:11:37 +00:00
Stefan Csomor
e516208e3d exposing wxGraphicsContext through an ordinary wxDC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 15:10:07 +00:00
Václav Slavík
c08598f6cd Fix typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 14:14:55 +00:00
Václav Slavík
f6410588cf Don't iterate over selection twice needlessly in wxDataViewMainWindow::ItemDeleted().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 14:14:53 +00:00
Václav Slavík
b23de238c8 No change, improve wxDataViewMainWindow::ItemDeleted() readability.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 14:14:50 +00:00
Vadim Zeitlin
fa93d732e2 Harmonize wxDataViewCtrl::GetSelection() behaviour in all ports.
wxDataViewCtrl::GetSelection() now always returns invalid item if more than
a single item is selected in a multi-selection control.

Also add HasSelection() and GetSelectedItemsCount() to allow checking if any
items are selected.

Updated the documentation, all ports and added a test for all these functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:41:19 +00:00
Vadim Zeitlin
c3ad4d4a45 No changes, just use CPPUNIT_ASSERT_EQUAL() instead of CPPUNIT_ASSERT().
CPPUNIT_ASSERT_EQUAL() gives more informative error messages in case of
failure which is important when running tests unattended on build slaves.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:41:12 +00:00
Vadim Zeitlin
0eec47e4a2 No changes, just add wxGtkList to ensure g_list_free() is always called.
Add an extremely simple RAII wrapper around GList and use it.

Also add wxGtkTreePathList which also automatically frees its contents to
simplify working with the lists of GtkTreePaths.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:41:00 +00:00
Vadim Zeitlin
040050b8f4 Don't export Objective C interfaces in non-x86_64 builds.
Doing this is unnecessary and results in compilation errors in PPC and x86
builds when using old (4.0.1) version of the compiler.

So make WXEXPORT added in r67575 specific to 64 bit builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:38:36 +00:00
Vadim Zeitlin
ae2047c32a Add XRC handler for wxBannerWindow and a test for it to the xrc sample.
Also document the new XRC format elements.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:18:56 +00:00
Vadim Zeitlin
50c202914e No changes, just factor our wxDirection parsing code in wxXRC.
Move it from wxButtonXmlHandler into a reusable wxXmlResourceHandler::
GetDirection() that can used by the other handlers too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:18:49 +00:00
Vadim Zeitlin
ea11bf3abc Add new wxBannerWindow class.
A simple banner showing either a bitmap or some text on gradient background.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:18:43 +00:00
Vadim Zeitlin
e55d569400 Add @genericAppearance Doxygen macro.
This allows to provide just a single image (in "generic" subdirectory) for the
generic controls that look the same in all ports instead of having to create
three identical ones (in "wxmsw", "wxgtk" and "wxmac" subdirectories) that are
required by @appearance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:18:33 +00:00
Vadim Zeitlin
902334c8fa Fix the coordinates in wxDataViewCustomRenderer::LeftClick() in generic wxDVC.
The code in generic wxDataViewCtrl implementation didn't take the space taken
by tree expander button nor the indentation of child nodes into account, so
the coordinates passed to LeftClick() could be completely wrong.

Fix this by offsetting them to ensure that click coordinates are always
relative to the cell client area.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 12:13:39 +00:00
Julian Smart
abcb9c6e58 Fix duplicate variable for VC++ 6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 11:27:44 +00:00
Julian Smart
62f9f10d92 Rename identifier
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 11:26:46 +00:00
Steve Lamerton
33baee46ee Add new sample project files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 09:21:16 +00:00
Steve Lamerton
98d689e403 Rebake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 09:16:48 +00:00
Steve Lamerton
2703a31ac8 Export a couple of carbon functions so that shared builds in carbon compile correctly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-22 08:45:25 +00:00
Vadim Zeitlin
665ec08c05 Add missing wx/icon.h header to fix wxGTK compilation.
wx/withimages.h needs to include wx/icon.h as it contains an inline function
returning wxIcon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 14:52:16 +00:00
Vadim Zeitlin
87df1c87e2 Refactor: replace wxTreeItemId and wxDataViewItem with new wxItemId<>.
Add wxItemId<> template which can be used to identify items in different
{tree,list}-like controls, including wxDataViewCtrl (where it replaces, in
backwards compatible way, wxDataViewItem), wxTreeCtrl (where it replaces
wxTreeItemId) and the upcoming wxTreeListCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 14:08:56 +00:00
Vadim Zeitlin
64ee1d68b1 No changes, just move wxCheckBoxState to wx/defs.h from wx/checkbox.h.
Move the enum to allow reusing it in other places.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 14:08:52 +00:00
Vadim Zeitlin
1871b9facb No changes, just use symbolic NO_IMAGE constant instead of -1 or wxNOT_FOUND.
Existing declarations used -1 in several places to indicate the absence of the
image which wasn't especially clear and was also inconsistent with other
places that used wxNOT_FOUND which didn't make much sense in this context.

Add a new symbolic constant NO_IMAGE in wxWithImages and use it in the classes
deriving from it. This still doesn't help with wx{Tree,List}Ctrl but improves
clarity for the other classes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 14:08:49 +00:00
Vadim Zeitlin
abfdefede3 Add wxWithImages helper mix-in with {Set,Get,Assign}ImageList() methods.
Avoid defining SetImageList() in several different places in wx API as not
only this resulted in (trivial) code duplication but this method also had
different semantics before: it didn't take ownership of the pointer passed to
it in wxTreeCtrl, wxListCtrl and wxBookCtrl and derived classes but did take
its ownership in wxDataViewTreeCtrl and wxRichTextFormattingDialog.

Harmonize this for all the classes now: SetImageList() never takes ownership
while AssignImageList() (which is now available in all classes having
SetImageList()) always does.

Also add convenience wxWithImages::GetImage() helper to avoid (more) code
duplication in wxDataViewTreeCtrl code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 14:08:43 +00:00
Vadim Zeitlin
36a96421b3 Replace wxComboBox::IsEmpty() with Is{List,Text}Empty().
IsEmpty() didn't exist in all ports (notably not wxMSW) and its meaning was
unclear anyhow, so remove it even from the ports where it did exist and add
clear Is{List,Text}Empty() replacements instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 12:06:16 +00:00
Václav Slavík
9489ebf0f1 Rename wxDataViewCtrl::InvalidateColBestWidth* to UpdateColBestWidth*.
The new names make it more clear that the functions don't just set an
invalidated flag, but that they actually do some recalculations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 09:07:06 +00:00
Václav Slavík
ac0981084b Fix autosize columns width calculation in generic wxDataViewCtrl.
Column widths were recomputed too soon -- after the model changed, but
before the control's own data structures were updated to reflect the
change. This could lead to incorrect calculations or worse, crashes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 09:07:02 +00:00
Steve Lamerton
ce88a107ad Fix history when using custom schemes in GTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-20 14:04:28 +00:00
Vadim Zeitlin
5d9138be7f Add a one line script to clean patches before submitting them for review.
Exclude changes to the auto-generated files using filterdiff.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-20 12:25:53 +00:00
Steve Lamerton
5b91ac0603 Add virtual destructors to fix GCC4 warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-20 10:59:09 +00:00
Steve Lamerton
392594bb41 Another compilation fix for OSX 10.5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-20 09:50:00 +00:00
Václav Slavík
0b93babdc0 Reorganize wxDataViewMainWindow::ItemAdded() for better readability.
Reuse common code. No real changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 18:25:28 +00:00
Dimitri Schoolwerth
409fe759e1 Fixed failing test in ImageTestCase for builds made with makefiles.
The recently added BMP images in tests/image/ were not being copied. Added them to test.bkl and regenerated makefiles.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 16:10:07 +00:00
Steve Lamerton
43d53ee501 Update documentation for new library name.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 13:30:46 +00:00
Steve Lamerton
467d261e9d Rename web library to webview.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 10:45:16 +00:00
Steve Lamerton
e7aef23e7b Rename wxUSE_WEB to wxUSE_WEBVIEW to reflect that actually it specifically toggles the wxWebView class and associated features.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 09:15:06 +00:00
Dimitri Schoolwerth
659185ff80 Documented wxIMAGE_OPTION_TIFF_* options that are currently in use.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 03:57:06 +00:00
Dimitri Schoolwerth
2453ceee20 Use a default photometric interpretation value of PHOTOMETRIC_MINISWHITE instead of PHOTOMETRIC_MINISBLACK for greyscale and b/w TIFF images.
Closes #13194.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 03:50:45 +00:00
Dimitri Schoolwerth
fc695138b4 Added option to TIFF handler for specifying the photometric interpretation.
Added option wxIMAGE_OPTION_TIFF_PHOTOMETRIC for reading and writing TIFF images. This is mostly for being able to distinguish between PHOTOMETRIC_MINISBLACK (chocolate flavour) and PHOTOMETRIC_MINISWHITE (vanilla) as currently the flavour used was fixed. It applies to greyscale as well as black and white images. Added unit tests to verify the written photometric value.

Also see #13194.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 03:47:40 +00:00
Dimitri Schoolwerth
8e28cc4701 Added support for saving greyscale TIFF images.
When saving with a samples per pixel value of 1 the TIFF handler still treated the image as RGB, resulting in corrupted images. Handle the greyscale case and added a unit test for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 02:35:48 +00:00
Dimitri Schoolwerth
7f77b25ea8 Changed TIFF handler's monochrome conversion to look at the green channel instead of red.
It's common when reducing a coloured image to greyscale or black and white to give the green channel more significance. Since we're only looking at a single channel use the green one instead of red.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 02:27:11 +00:00
Dimitri Schoolwerth
0e11090ef6 Fixed crash when saving as a monochrome TIFF image with incomplete options set.
When setting only wxIMAGE_OPTION_TIFF_BITSPERSAMPLE to 1 the used samples per pixel (wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL) would still be set to 3. This is invalid and confuses libtiff, resulting in a crash ("possible heap corruption" during _TIFFfree using WinXP+MSVC8). Set the used samples per pixel to 1 explicitly in cases where only bits per sample is set to 1. Added a unit test to check for this problem (and verify the bits per sample from the saved image is indeed 1).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 02:00:25 +00:00
Dimitri Schoolwerth
096c930c16 No code changes.
Renamed variable bpp (bits per pixel) in TIFF handler to what it actually represents: bps (bits per sample).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 01:31:07 +00:00
Dimitri Schoolwerth
d65172db90 Renamed the options specific to the TIFF handler.
The loading/saving options that are specific for TIFF were in the form of wxIMAGE_OPTION_<name> while all other non-generic options use the form wxIMAGE_OPTION_<imagetype>_<name>. Renamed the TIFF options to the form wxIMAGE_OPTION_TIFF_<name> and kept the old names for backwards compatibility.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 01:19:21 +00:00
Dimitri Schoolwerth
6f54591185 improved wxImage documentation.
moved description of wxIMAGE_OPTION_GIF_COMMENT from wxImage::GetOptionInt documentation to wxImage::GetOption because the value of the GIF option is a string, not int.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 01:13:16 +00:00
Dimitri Schoolwerth
7a10e465ca Improved saving of TIFF monochrome images.
When reducing an RGB image to black and white any non-black pixel was treated as white resulting in mostly white images. Set the threshold to 127 instead to improve the looks of saved monochrome TIFF images.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 01:08:36 +00:00
Steve Lamerton
000a9e77b0 Remove a couple of unused forward declarations.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-18 13:29:16 +00:00
Dimitri Schoolwerth
7ffc9affb4 Fixed saving TIFF images to wxMemoryOutputStream.
Libtiff attempts to seek past the end of a stream and the behaviour for this can vary per stream implementation. Fixed failure to seek by filling the gap between the end of stream and new seek position with zeroes. Enabled a unit test which so far was disabled due to wxMemoryOutputStream failing to save a TIFF because of the seeking problem.

Also closes #4089.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-18 13:15:43 +00:00
Steve Lamerton
74a8f67d96 Add some version checks to help compiling on OSX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-18 10:51:57 +00:00
Steve Lamerton
39ab701469 Remove MoveWindow method.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-18 09:26:52 +00:00
Dimitri Schoolwerth
d06c3098ab Improved BMP decoding.
The BMP decoder did not handle images that are not stored upside down but straight up (in which case the height is negative). Also with RLE4 or RLE8 compressed images the 'end of scanline' RLE marker was not handled correctly. Fixed the issues and added a unit test for them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 21:01:09 +00:00
Steve Lamerton
6849a4b714 Return true by default under OSX WebKit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 13:50:01 +00:00
Steve Lamerton
0e830c7c52 Correctly stop the loading animation in the sample when we veto navigation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 13:46:09 +00:00
Steve Lamerton
3225a4b8b8 Derive wxWebViewEvent from wxNotifyEvent.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 11:19:29 +00:00
Steve Lamerton
4d0dddc7ad Rename LoadUrl to LoadURL. This corrects the capitalisation as it is an acronym, and brings it into line with GetCurrentURL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 10:55:59 +00:00
Steve Lamerton
9af5122202 Tidy up webview.h. Remove all of the doxygen comments which have now been moved to the interface file. Organise method declarations more sensibly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 10:49:17 +00:00
Steve Lamerton
fba4c7c91b Make a few internal methods private.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 10:36:14 +00:00
Vadim Zeitlin
ee19ab6d80 Use correct format specifier for thread id in the sample.
Thread id is an (unsigned) long, not just unsigned, so use "%lx" to print it
instead of "%x" to avoid asserts in formatting code.

Closes #13404.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 10:35:29 +00:00
Vadim Zeitlin
2032371b3b Restore stock item labels mistakenly removed by r68641.
The patch adding separate string for the labels with mnemonics and the ones
without them has somehow managed to remove entries for 10 stock ids.

Restore them now.

Closes #13403.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 10:35:25 +00:00
Steve Lamerton
e669ddde23 Const correct the wxWebView api.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 10:26:09 +00:00
Julian Smart
827fb0e455 Better text control non-selection solution
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-17 08:38:00 +00:00
Julian Smart
63509fb3c4 Implemented non-selection of content when setting focus via the keyboard.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 20:52:15 +00:00
Stefan Csomor
675ec6655e adapting to new ctrl constant handling on OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 13:46:56 +00:00
Stefan Csomor
3bc6d53403 adapting to new ctrl constant handling on OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 13:45:05 +00:00
Stefan Csomor
cfc77ac09a adapting to new ctrl constant handling on OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 13:36:24 +00:00
Stefan Csomor
773db5dfb3 supporting full style mask
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 12:42:56 +00:00
Vadim Zeitlin
04f1f9b773 wxMSW compilation fix when not using PCH.
Add missing "wx/menu.h" include.

Coses #13399.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 12:24:28 +00:00
Stefan Csomor
ee44283198 adjust init to standard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 12:17:59 +00:00
Stefan Csomor
3e7c34b5a1 support for raw ctrl shortcut
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 12:17:13 +00:00
Stefan Csomor
8680646d5c emulate more arrow keys on non msw platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 12:01:27 +00:00
Stefan Csomor
3c5f62640d adapt defines for ctrl/command key
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 12:00:52 +00:00
Stefan Csomor
5266f34590 adapt defines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 11:55:39 +00:00
Paul Cornett
d0f93bc7dc Avoid creating rect with negative size while clipping to DC size.
Also, don't convert result of wxDC::GetSize() to device coords, it's already device coords.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 07:02:37 +00:00
Steve Lamerton
49f07becce Add a menu item linking to a custom scheme example.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-15 13:10:34 +00:00
Steve Lamerton
6b366b9929 Update bakefile for new header names.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-15 12:37:05 +00:00
Steve Lamerton
c13d6ac1ea Rename wxWebHistoryItem to wxWebViewHistoryItem.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-15 12:31:31 +00:00
Steve Lamerton
04fa04d806 Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent to wxWebViewEvent. This makes the names more consistent with other parts of wxWidgets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-15 11:03:26 +00:00
Vadim Zeitlin
f4cb7c58da Fix return value of wxMBConvUTF8::ToWChar() when not using MAP_INVALID_UTF8_NOT.
wxMBConvUTF8::ToWChar() was off by 1 when the input length was explicitly
specified, the extra NUL should only be added in the implicit length case.

This bug didn't occur for the default wxMBConvUTF8 object as it simply
forwarded to the base class wxMBConvStrictUTF8 implementation but it happened
when MAP_INVALID_UTF8_TO_OCTAL or MAP_INVALID_UTF8_TO_PUA was used.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-14 19:39:31 +00:00
Stefan Csomor
6a0d7a989c fixing comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-14 15:43:30 +00:00
Stefan Csomor
77aa5fa027 fixing open application event handling, fixes #13397
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-14 15:42:35 +00:00
Stefan Csomor
73d1308b85 adding two missing strings (used in docview)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-14 15:41:10 +00:00
Steve Lamerton
9f72fa7c2d Add missing bakefile from previous commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-14 12:25:44 +00:00
Steve Lamerton
7d8d6163ad Rename wxWebFileHandler to wxWebViewArchiveHandler, wxWebHandler to wxWebViewHandler. Update the documentation and the sample. Add a constructor taking a wxString to specify the scheme in wxWebViewHandler.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-14 12:15:34 +00:00
Stefan Csomor
35f5a520e2 using proper cmd constant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-14 11:55:36 +00:00
Paul Cornett
2e952cd113 simplify global cursor setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 16:17:59 +00:00
Steve Lamerton
3beb50e570 Merge in from trunk r68626 - r68683
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 16:01:47 +00:00
Steve Lamerton
603cfe4218 Add various selection menu items to the sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 15:45:39 +00:00
Steve Lamerton
54883129ae Add Run Script menu option to the sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 14:53:46 +00:00
Steve Lamerton
10ad4ba669 Add history list to the sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 14:11:32 +00:00
Vadim Zeitlin
9f4e2e269c Fix bitmap position attribute name in XRC handler.
Bitmap position attribute was called "bitmapposition" in the documentation and
in the code that generated an error message for a wrong value in it but was
inexplicably called "direction" in the code that really looked it up.

This seems to be just a straight typo from the original r61065. Surprising as
it is that it wasn't noticed before, do correct it now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 13:54:26 +00:00
Steve Lamerton
70544c1e6c Call Dismiss rather than Show(false) on the infobar to correct the layout.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 10:07:03 +00:00
Steve Lamerton
013cda40d8 Fix loading history items under GTK. The wrong function was being used.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 09:41:50 +00:00
Vadim Zeitlin
f23b8c0d85 No changes, just remove gratuitous inefficiency from generic wxDVC.
Don't return wxDataViewMainWindow::m_selection array by value, returning a
const reference to it is enough and avoids completely unnecessary memory
allocations and copying of potentially large amounts of data.

Also make wxDataViewMainWindow::GetSelections() const.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-12 14:09:41 +00:00
Vadim Zeitlin
3823a15e2c Fix compilation of generic wxDVC code when not using STL containers.
wx sorted containers don't implement iterators so use indices to iterate over
wxDataViewMainWindow::m_selection, just as r68613 already did in another place.

Closes #13388.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-12 14:09:37 +00:00
Steve Lamerton
fe104ff925 Update documentation about custom schemes and virtual file systems.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-12 10:49:52 +00:00
Steve Lamerton
f239a20092 Fix history in wxWebViewIE when using a custom file scheme.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-12 10:44:50 +00:00
Steve Lamerton
eea4d01c65 Use the data scheme to load resources in the WebKitGTK+ implementation, rather than temporary files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-12 09:35:41 +00:00
Paul Cornett
f795e58659 remove unneeded gdk_window_get_pointer() call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-12 05:45:59 +00:00
Paul Cornett
803a1b9454 pass proper window to gdk_window_get_pointer(), NULL does not work with GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-12 05:33:59 +00:00
Steve Lamerton
5e3e62bc6e Add support for custom scheme handling and virtual file systems to the OSX WebKit implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 18:56:13 +00:00
Steve Lamerton
1c29aacad8 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 2011-08-11 12:21:47 +00:00
Vadim Zeitlin
f8a1c5715f Use separate strings for stock labels with and without mnemonics.
Obtaining the string without mnemonics by simply removing "&" characters from
the string containing mnemonics doesn't work for some languages, notably
Chinese where the convention is to use "Chinese Text (&M)" for the labels with
"M" being the ASCII mnemonic and just "Chinese Text" and not "Chinese Text (M)"
should be used if wxSTOCK_WITH_MNEMONIC flag is not specified.

Fix the fundamental problem by using separate strings for the two cases.
Translations still need to be updated to really correct the labels appearance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 10:56:05 +00:00
Steve Lamerton
abd474ea63 Fix typo in last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 10:54:02 +00:00
Steve Lamerton
d2e66707de Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 10:49:50 +00:00
Stefan Csomor
b8a14a1708 adjusting include styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 08:43:38 +00:00
Stefan Csomor
407f216223 adjusting include styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 08:43:13 +00:00
Stefan Csomor
2e14066008 fixing osx_carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 08:42:39 +00:00
Stefan Csomor
59cb255555 fixing osx_cocoa, there's a reason m_peer is private in the base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 08:24:26 +00:00
Stefan Csomor
b404a8f3b0 fixing osx_cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 08:14:37 +00:00
Dimitri Schoolwerth
f5f302d721 Fixed wxOSX build.
Since r68621 dataview.cpp didn't compile anymore (at least with wxOSX-Carbon). Fixed by explicitly using wxDataViewItem's void * constructor in a few cases.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-11 00:39:18 +00:00
Vadim Zeitlin
3059334387 Basque translations update from Xabier Aramendi.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 21:57:05 +00:00
Vadim Zeitlin
724cbfff65 Also regenerate configure after wxWeb-related bakefile changes.
Configure must be rebuilt after any changes to autoconf_inc.m4 but this wasn't
done by the previous commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 21:07:18 +00:00
Steve Lamerton
a032168d8c Complete rebake with web libraries to allow easier testing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 18:32:52 +00:00
Steve Lamerton
94e0018723 Merge in from trunk r64802 - r68625
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 18:10:42 +00:00
Václav Slavík
cbef7338c1 Add some basic tests for wxDataViewCtrl selection handling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 15:24:25 +00:00
Václav Slavík
57ab45460d Fix selection handling wxDataViewMainWindow::ItemDeleted().
The code to update m_selection was too aggressive in the virtual list
case, when it simply cleared it, and broken for single-item selection in
the general case.
Fixed to recompute selection properly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 15:24:19 +00:00
Václav Slavík
d5c4a81f2e Make the wxDataViewItem(void*) constructor explicit.
Not having this as an implicit one made it possible to create
wxDataViewItem from any pointer without realizing it, leading to hard to
debug crashes later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 15:21:22 +00:00
Julian Smart
3c6cc33082 Added the ability to deselect attributes in the font dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 14:06:28 +00:00
Dimitri Schoolwerth
ee7553e935 Added NSApplicationDelegate's openFiles for wxOSX-Cocoa.
openFiles (available since OS X 10.3) replaces using the openFile method. It allows for more convenient handling of multiple drops and knowing in advance how much files/folders are dropped instead of openFile with which you only get to respond to a single file/folder drop at a time. By default openFiles calls the newly added MacOpenFiles which calls MacOpenFile multiple times, so ordinarily the behaviour is backwards compatible (both on wxOSX Cocoa and Carbon).

The openFile instance method has been removed because it doesn't seem to be called anymore: neither when dropping a single file on the application in the dock or Finder nor when passed as a command-line argument.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-09 22:17:12 +00:00
Vadim Zeitlin
af9c02ce20 Don't reset wxTLW::m_iconized when hiding the window in wxMSW.
Calling Hide() on an iconized window wrongly reset its m_iconized flag but
hiding the window shouldn't affect it.

Closes #13373.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-09 15:46:28 +00:00
Václav Slavík
eceb6af158 Don't use iterators with wxDataViewSelection.
They aren't implemented when using wx's homegrown sorted containers
and adding support is probably more trouble than it's worth.

Fixes #13388.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-09 11:35:32 +00:00
Vadim Zeitlin
b86ac1efaa No changes, just correct the helpview sample name in comment.
"printing.cpp" was used for whatever reason.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-09 11:25:09 +00:00
Vadim Zeitlin
5d8d4b669a Don't manually centre dialogs created with default position in wxMSW.
We always centered the dialogs on the main display which was wrong if the
parent window was on another one. Instead of fixing it, simply don't centre
them at all and let Windows position them, there is no reason to change the
default behaviour.

Closes #13387.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 15:15:50 +00:00
Steve Lamerton
3baf235f60 Use shared pointers to hold wxWebHandlers throughout.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 15:12:33 +00:00
Steve Lamerton
fea281f428 Add wxWebView sample to documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 14:24:28 +00:00
Steve Lamerton
66a8d41423 Improve the detailed description in the documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 14:03:15 +00:00
Steve Lamerton
caa1ec9545 Note that CanCut / CanCopy / CanPaste are not currently supported on the OSX WebKit implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 12:18:58 +00:00
Steve Lamerton
0abf68248a Fix a bunch of spelling mistakes cause by an early commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 12:12:51 +00:00
Steve Lamerton
062dfc9a96 Add backend descriptions for all backends to the documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 12:05:58 +00:00
Steve Lamerton
25b2deb8a5 Add a section about async notifications to the documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 11:22:40 +00:00
Václav Slavík
373a4816d4 Check for invalid items in generic wxDataViewCtrl::GetSelections().
This shouldn't normally happen, but if some bug causes it, detect it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 10:23:19 +00:00
Václav Slavík
04675edfb1 Remove selection methods taking int from generic wxDataViewCtrl.
Current public API uses wxDataViewItem, this code dated back to 2.8.
They were now protected instead of public, the code wasn't used
anywhere and wasn't portable, it existed only in the generic version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 10:11:04 +00:00
Vadim Zeitlin
ddae52629c Added wxTopLevelWindow::MSWGetSystemMenu() method.
Also generate events corresponding to WM_SYSCOMMAND messages for the custom
items of the system menu.

Add a small snippet to test the new functionality to the dialogs sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 09:32:42 +00:00
Vadim Zeitlin
960493053b Added private wxMenu::MSWNewFromHMENU() method.
Add a method allowing creation of a wxMenu object from a native menu handle.
This will be used to implement access to the system menu in an upcoming commit
but could also be useful for other purposes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 09:32:39 +00:00
Vadim Zeitlin
8a625e0bb9 Fix compilation with g++ 4.7 (prerelease).
The workaround for a bug in g++ 3.5 breaks compilation with 4.7 which
implements two-phase lookup correctly, so disable this workaround for 4.7 and
later. We could probably even only enable it for 3.x but this doesn't really
matter as previous 4.x releases don't have problems with this anyhow.

Closes #13385.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 08:33:19 +00:00
Vadim Zeitlin
5d0152c2b9 Use 0 instead of NULL to avoid g++ warning.
g++ (usefully) warns when assigning NULL to a non-pointer in wxGDIPlusRenderer.

Just use 0 instead of NULL to avoid the warning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-07 19:31:52 +00:00
Václav Slavík
8c7b871156 Use ChangeCurrentRow() in wxDataViewMainWindow::ItemDeleted().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-07 17:29:50 +00:00
Václav Slavík
b625294905 Clean up wxDataViewMainWindow::ItemDeleted() a bit.
Reuse shared code instead of duplicating it. No real changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-07 17:29:47 +00:00
Václav Slavík
c3b0247de1 wxDataViewSelection private type doesn't need to be exported.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-07 17:29:44 +00:00
Václav Slavík
43d2d359ce Remove unused ItemList type from datavgen.cpp.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-07 17:29:41 +00:00
Steve Lamerton
1680c3561b Remove some out of date comments.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-07 09:24:02 +00:00
Steve Lamerton
c75400ea22 Remove the WebView - wxWebViewWebKit map as our policy delegates already held a pointer to the control.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-07 09:19:16 +00:00
Steve Lamerton
ca897b5184 Remove old WXCOCOA code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-06 13:55:15 +00:00
Steve Lamerton
94ec73c74c Implement GetSelectedSource for the OSX WebKit backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-06 13:32:40 +00:00
Steve Lamerton
835165d576 Implement SelectAll for OSX WebKit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-06 12:58:26 +00:00
Steve Lamerton
c6ea1fdaf9 Implement GetPageText for the OSX WebKit implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-06 12:48:22 +00:00
Steve Lamerton
ef53bf2a7b Implement ClearSelection for the OSX WebKit backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-06 12:20:37 +00:00
Steve Lamerton
fc35191279 Remove string conversion functions and use the wx provided ones.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 19:12:32 +00:00
Vadim Zeitlin
59f495db65 Implement wxFileType::GetOpenCommand() in wxOSX.
This method used to work in 2.8 but was unimplemented in 2.9.

Restore more or less the old implementation using the data that we already
have in wxMimeTypesManager anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 19:02:26 +00:00
Steve Lamerton
895e112c7c Remove redundant InternalLoadURL method.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 18:58:38 +00:00
Steve Lamerton
4c552a824c Remove now unnecessary comment.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 18:41:54 +00:00
Steve Lamerton
1f0acb4355 Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the page title.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 18:23:08 +00:00
Steve Lamerton
515fd027c5 Implement GetBackwardHistory, GetForwardHistory and LoadHistoryItem for OSX WebKit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 16:40:46 +00:00
Steve Lamerton
6a504e88df Implement ClearHistory using the built in WebBackForwardList rather than a shared WebHistory on OSX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 15:37:03 +00:00
Steve Lamerton
7c36630b57 Add a WebHistory to the OSX WebKit backend and implement ClearHistory.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 13:56:50 +00:00
Steve Lamerton
2f70baea2f Remove now unused GetSelection from the OSX WebKit backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 13:25:30 +00:00
Steve Lamerton
6368d96506 Add undo / redo support to OSX WebKit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 13:17:19 +00:00
Steve Lamerton
211da8a57d Add support for loading resources in custom schemes for the WebKitGTK+ backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-05 09:06:45 +00:00
Vadim Zeitlin
7112cdd1f3 Add support for wxHELP button to wxMessageDialog.
Implement support for wxHELP for wxMSW, wxGTK and wxOSX/Cocoa (at least when
showing the message box from the main thread, there doesn't seem to be any way
to show more than three buttons with CFUserNotificationDisplayAlert() so
"Help" button is not supported when using it).

This is useful not only on its own, i.e. to allow the user to ask for help,
but also because it brings the total number of buttons supported by the
message dialog to 4, meaning that more choices can be offered to the user
(which is rarely, but not quite never, useful).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 22:53:42 +00:00
Steve Lamerton
42be0c562b Add documentation for virtual file system support in wxWebView.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 18:46:49 +00:00
Vadim Zeitlin
3fb39fd56c Add missing header for minimalistic builds not using PCH.
wxWindow might not be fully declared in dcbase.cpp but we need its full
declaration for wxDCImpl::InheritAttributes() so explicitly include
wx/window.h -- while this is usually already included from somewhere else it
might not be in minimal builds with a lot of features disabled.

Closes #13380.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 16:12:41 +00:00
Vadim Zeitlin
eb2087c5e6 Compilation fixes for wxUSE_GEOMETRY==0 build.
Add missing wxUSE_GEOMETRY checks to wxAffineMatrix2D-related code.

Closes #13379.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 16:12:36 +00:00
Vadim Zeitlin
1df57a24e5 Use wxWindowMSW instead of wxWindow to fix wxUniv/MSW compilation.
wxFindWindowAtPoint() only returns wxWindowMSW, not the derived wxWindow, in
wxUniv build so assign its return value to wxWindowMSW to avoid compilation
problems in it.

Closes #12534.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 16:12:31 +00:00
Vadim Zeitlin
47e2f88166 Avoid unwanted line break in wxDataViewListModel::GetCount() docs.
Using "i.e." in the brief Doxygen comment makes it end it after the second
period and results in truncated brief description and an unwanted line break
in the full description.

Just avoid using periods for now inside the brief description. Maybe a better
solution could be found in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 13:19:57 +00:00
Julian Smart
4c7d9d88b7 Added Page Break control to spacing page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 12:31:44 +00:00
Steve Lamerton
e6db07c3ef Update wxWebFileHandler to handle paths with fragments correctly, some backends pass this to the handler and some don't so we strip it if necessary.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 08:54:54 +00:00
Steve Lamerton
36b52591b5 Fix recursion problems when loading pages from a virtual file system using the WebKitGTK+ backend. Navigating through pages in an archive now works correctly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 08:30:37 +00:00
Steve Lamerton
00b89a1d1d Rename wxWebFileHandler name from test to file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-03 18:51:53 +00:00
Steve Lamerton
b7d3a622aa Rework IE virtual file system support to use new syntax. Remove now unused code for resolving links ourselves, we can let the backend resolves them itself.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-03 18:31:48 +00:00
Julian Smart
5755acd77f Return sensible major and minor version numbers for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-03 15:46:43 +00:00
Julian Smart
41d9dcbc60 Outline and line spacing can now be reset via the UI; format dialog layout improvements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-03 11:41:17 +00:00
Steve Lamerton
f2049b6837 Initial work on virtual file system support for the WebKitGTK+ backend. It now supports loading single pages from the VFS system.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-03 09:29:30 +00:00
Vadim Zeitlin
6e92c2991b Fix bug with TAB being able to switch focus between MDI frames.
The keyboard navigation code correctly checked that TAB was not propagated
above the TLW containing the window in which the key was pressed to avoid
switching focus between different TLWs by pressing TAB.

However wxMDIChildFrame is not a TLW and so it was possible to switch focus
between two different MDI child frames by pressing TAB. This was unexpected
and counterintuitive, especially because the frame receiving focus was not
even activated (which might be another bug).

Fix this by adding a new wxWindow::IsTopNavigationDomain() virtual method that
can be overridden to indicate that a window is a self-contained "keyboard
navigation domain" and that keyboard events shouldn't propagate outside of it
and override it in both wxTopLevelWindow and wxMDIChildFrame to ensure that it
behaves correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-03 00:45:42 +00:00
Vadim Zeitlin
2a0777a8f0 No real changes, just rename a variable.
"focussed" spelling is unusual and inconsistent with "focused" used in many
other places in the same file, so renamed "focussed_child_of_parent" and also
use standard camelCase naming convention for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-03 00:45:38 +00:00
Robin Dunn
ec3f5752a0 If -1 is passed to InsertItem for the imageIndex then don't set wxLIST_MASK_IMAGE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 20:23:42 +00:00
Robin Dunn
6c797d8fd1 Initialize the native printer info for ConvertFromNative if it hasn't been done already.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 19:49:02 +00:00
Vadim Zeitlin
57429bfda5 Don't un-maximize the window when Iconize(false) is called in wxMSW.
Calling Iconize(false) on a maximized window restored it to its normal state
instead of doing nothing as expected.

Return immediately from Iconize() if the requested state is already the
current one to avoid it.

Closes #13373.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 19:46:44 +00:00
Vadim Zeitlin
9be02147f0 Fix wxSocket::WaitForAccept() in blocking mode.
When wxSocket::WaitForAccept() was called from another thread or on a socket
with wxSOCKET_BLOCK flag it didn't work because it called
wxSocketImpl::Select() with wxSOCKET_CONNECTION_FLAG which was only handled
for the client sockets in this function.

Handle it now for the server ones too, this should allow blocking server
sockets to work again.

Closes #12836.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 19:46:40 +00:00
Vadim Zeitlin
d6f2b04c72 Remove documentation of non-existent wxTextAttr::CreateFont().
This method doesn't exist (only GetFont() does), so don't document it.

Closes #13372.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 19:46:35 +00:00
Julian Smart
0aeb2e3f9b Added semicolon needed by MSVC++ 6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 14:43:15 +00:00
Steve Lamerton
7bd30a12ad Implement HasSelection for the OSX WebKit backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 09:44:07 +00:00
Steve Lamerton
8ba4faba4d Add EnableHistory support to the OSX WebKit backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 09:21:47 +00:00
Steve Lamerton
e28cc3ca0a Fix warnings for the OSX WebKit backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 17:57:48 +00:00
Steve Lamerton
fdc255cfe0 Fix compilation for OSX backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 17:41:14 +00:00
Steve Lamerton
cddf4541fa Add missing wxRTTI macros and fix incorrect ones.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 15:49:05 +00:00
Steve Lamerton
75b0b0bcae Hide the infobar in the sample if we start navigating to another page.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 14:05:32 +00:00
Steve Lamerton
b7d74e9ca3 Fix remaining warnings in ie backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 13:20:46 +00:00
Steve Lamerton
8bccab8f06 Fix all the unused variable warnings in the sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 13:09:10 +00:00
Steve Lamerton
888b6835d8 Make web sample XPMs const to fix compiler warnings on gcc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 12:54:09 +00:00
Steve Lamerton
bd6f9534d6 Fix a couple of warning that crept back into the GTK backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 12:35:52 +00:00
Steve Lamerton
bd7901aaec Add missing lines to setup.h.in. This properly fixes compilation under configure based environments. Also update the include guards for the wxWebHistoryItem files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 10:10:20 +00:00
Steve Lamerton
263e3a8327 Rework the GTK WebKit backend history to remove the need for the map between wxWebHistoryItems and WebKitWebHistoryItems.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-31 15:37:55 +00:00
Steve Lamerton
eafdb19c44 Split wxWebHistoryItem headers out into separate files for each backend. This will allow us to dramatically reduce the amount of code in the GTK history implementation and implement it and OSX history support more cleanly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-31 14:06:33 +00:00
Václav Slavík
1969499c6f Silence Clang warning about numeric_limits<> specialization.
libstdc++ (which is used by Clang) defines numeric_limits<> as a struct
and Clang issues a warning about our specialization that uses 'class'.
As libstdc++ developers have no intention of fixing this, silence the
Clang warning by using 'struct' for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-31 13:25:33 +00:00
Václav Slavík
7198c33680 Disable symbols visibility support for the Clang compiler.
Even Clang++ shipped with Xcode 4.1 still can't handle visibility
of non-inline methods in exported template classes if the default
visibility is 'hidden'.

Disable visibility support for Clang for now, we'll revisit it in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-31 13:25:30 +00:00
Vadim Zeitlin
bd5754f253 Correct typo in wxArray::insert() fix of r68468.
A wrong variable was mistakenly used.

Closes #13371.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-31 12:19:51 +00:00
Steve Lamerton
9b4670e5bc Simplify the wxWebFileHandler code by using a map to store the query string and manipulate it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-31 10:50:46 +00:00
Vadim Zeitlin
9c5c5c9cfd Fix crash in wxArray::insert() overload taking iterator range.
The iterator passed as argument could be invalidated by the function itself,
update it before using it.

Closes #13371.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 23:38:43 +00:00
Vadim Zeitlin
e999b903ca Generate events with WXK_NONE Unicode keys for non-characters in wxOSX.
The keyboard keys not corresponding to real characters, such as cursor arrows
or function keys, must generate wxKeyEvents with WXK_NONE as Unicode key code
to make it possible to distinguish them from the printable characters but
wxOSX generated events with valid Unicode key codes for them instead.

Avoid this by excluding Unicode key codes corresponding to code points in the
Unicode private use area: while this doesn't seem to be documented anywhere,
all non-printable characters seem to have their Unicode representation inside
it.

This change brings wxOSX keyboard event generation in line with the other
ports and, as a side effect, also closes #12423.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 21:54:21 +00:00
Vadim Zeitlin
66fc8b0e64 Avoid bogus focus loss event when wxTextCtrl is modified in wxOSX.
A wxEVT_KILL_FOCUS event was generated when wxTextCtrl::WriteText() was called
in wxOSX, even though the control didn't lose focus at all in this case. This
was completely unexpected and thoroughly confused wxGrid code which closed the
in place editor immediately after showing it because of this (this was perhaps
only the case since r68319 but the changes there were correct so they only
masked the real bug).

Avoid this bogus event by remembering the NSView currently being
programmatically modified and not doing anything in textDidEndEditing
notification if it is generated for this view.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 21:54:18 +00:00
Vadim Zeitlin
567e5e47ee Improve wxTextCtrl::GetNumberOfLines() unit test and documentation.
First, enable execution of the Lines() wxTextCtrl unit test case under wxOSX
as it passes since the fix in the previous commit.

Do add a test for GetNumberOfLines() that currently doesn't work in the same
way under all platforms -- but with this test we at least can be sure how does
it work exactly where.

Also mention the current discrepancy in this function behaviour in the
documentation.

See #12366.

Fix Lines() wxTextCtrl unit test to pass under wxGTK too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 21:54:15 +00:00
Vadim Zeitlin
2d5c15163a Fix off by one error in wxTextCtrl::GetLineLength() in wxOSX.
The trailing new line shouldn't be counted in the line length.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 21:54:08 +00:00
Vadim Zeitlin
d641b2d2a0 Fix stock accelerators handling in wxOSX.
No modifiers were used for stock accelerators, i.e. Append(wxID_NEW) resulted
in an item with the label "New" and plain "N" as accelerator in wxOSX. This
was due to wxACCEL_CMD not being handled in wxAcceleratorEntry::ToString() so
map it to the same prefix as wxACCEL_CTRL there, this is enough to make the
accelerators work even though it's not clear whether this is really the best
thing to do or if we should use a separate "Cmd+" prefix for it (and recognize
it in Parse() too then) as otherwise it's unclear why do we have wxACCEL_CMD
at all, it just seems to be treated identically to wxACCEL_CTRL everywhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 21:54:05 +00:00
Vadim Zeitlin
75618d57e4 Emphasize that wxStandardPaths must not be created directly.
wxStandardPaths::Get() must be used instead as the correct object to use might
have a different type.

See #11239.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 17:40:00 +00:00
Steve Lamerton
9e3d4a3210 Overhaul wxWebHandler naming to try and make it consistent with the rest of wxWidgets. Split wxWebFileHandler into its own file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 14:22:15 +00:00
Vadim Zeitlin
bf8f10225c Get rid of ugly wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST macro.
Replace it with wxWindowWithItems<> template class which takes care of
disambiguating between the two inherited Get/SetClientXXX() versions and use
it as a base class in all clases that previously used the macro.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 11:30:08 +00:00
Vadim Zeitlin
c29c95fe24 Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.
Use wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST for wxOSX/Cocoa too, not
only for wxOSX/Carbon. This macro adds methods to explicitly disambiguate
between the two inherited versions of each GetClientXXX() method, the one from
wxItemContainer and the other one from wxEvtHandler.

Closes #11637.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 11:30:03 +00:00
Steve Lamerton
153530afb5 Add new wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED event. Implement for all backends, extend the sample to demonstrate it and document. Also update some copyright notices.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 11:26:55 +00:00
Vadim Zeitlin
6ce832135e Add wxTextCtrl::PositionToCoords() functions for wxMSW and wxGTK.
The new method allows to find the coordinates in pixels of the given character
in a text control.

Closes #13221.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-29 15:11:54 +00:00
Steve Lamerton
e1efca6528 Add CombineURIs implementation for wxWebFileProtocolHandler. Update the IE backend to use it. Using the IE backend navigating through zip archives is now functional, including loading resources and links.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-29 10:33:54 +00:00
Steve Lamerton
47943187c1 Tidy up the include guards for the various wxWebView header files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-28 16:58:18 +00:00
Steve Lamerton
eff8f7952e Move the wxWebFileProtocolHandler from the IE backend to the common source, add the RegisterProtocol method to all classes (as a stub in GTK and OSX). Register the file protocol handler in the sample for testing purposes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-28 16:49:48 +00:00
Steve Lamerton
293656292f Initial implementation of wxWebProtocolHandler and wxWebFileProtocolHandler for the IE backend. This allows browsing of local files and files in zip archives when using a query string which specifies the protocol and path.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-28 16:08:59 +00:00
Vadim Zeitlin
d298f18ffb Mention wxGTK wxAnimation implementation limitations in the docs.
The native GTK implementation doesn't provide information about the frames
count nor access to individual frames.

See #13365.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-26 21:37:20 +00:00
Steve Lamerton
666f73c4d6 Very basic implementation of IInternetProtocolInfo, this will allow us to correctly parse links in virtual file systems.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-26 16:11:38 +00:00
Steve Lamerton
61d3188b01 Add a couple of missing forward declarations.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-26 13:45:24 +00:00
Steve Lamerton
75b3bb6163 We always let the user handle new window events so set the policy appropriately in the WebViewGTK+ backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-26 13:14:00 +00:00
Steve Lamerton
b132a83bff Fix compilation errors under OSX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-26 11:44:03 +00:00
Vadim Zeitlin
9f1bf94013 Compilation fix: include wx/event.h from wx/containr.h.
We now need wxEVT_XXX constants declarations in this file (at least when not
wxHAS_NATIVE_TAB_TRAVERSAL) so include wx/event.h to fix PCH-less build of
wxOSX.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-26 11:31:21 +00:00
Dimitri Schoolwerth
bc91da9610 Fixed wxOSX-Cocoa compilation.
OS X' wxComboBox::Init does not exist anymore since r68366 but an implementation still was present in combobox_osx.cpp which is used in Cocoa compilation. Removed the function.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 23:31:01 +00:00
Dimitri Schoolwerth
1f6831ea9b Fixed containr.h compilation with gcc.
At least apple-gcc 4.0 and 4.2 gave a compilation error on the three Connect calls in containr.h, insisting (unless using -fpermissive) on a declaration of Connect because there are no arguments to it that depend on a template parameter. Fixed by prepending BaseWindowClass to the Connect calls. Regression since r68363.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 22:31:17 +00:00
Steve Lamerton
906c935a80 Merge in from trunk r67662 to r64801
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 16:54:53 +00:00
Steve Lamerton
0995b9dc18 Fix warnings in the MSW IE backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 15:43:18 +00:00
Steve Lamerton
d37e7d35ad We no longer need to veto the new window event in the sample as the behaviour has been unified across the ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 15:19:26 +00:00
Steve Lamerton
aa35b9ca82 Link to urlmon from wxWeb to fix the compilation errors as we use CoInternetGetSession.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 15:10:33 +00:00
Steve Lamerton
e40741b95c Rename GetHref to GetURL in wxWebNavigationEvent, this brings it into line with the other functions in wxWebView.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 14:30:07 +00:00
Steve Lamerton
b236f090ed Add support for EVT_WEB_VIEW_NEWWINDOW to the OSX WebKit backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 13:55:54 +00:00
Steve Lamerton
45aa63c288 Clarify what GetTarget actually returns in wxWebNavigationEvent.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 13:37:29 +00:00
Steve Lamerton
d676fb218d Update handling and documentation for new window events. Clarify that you must handle the event if you require an action, the default is for nothing to happen.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 13:23:05 +00:00
Steve Lamerton
205defae89 Remove some now unused history variables.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 10:46:46 +00:00
Vadim Zeitlin
f0e5d5d22c No changes, just remove unnecessary wxPickerBase::OnSize().
This method did the same thing as the base wxWindow class event handler.

Also remove wxPickerBase event table which became empty after removing this
method.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-24 22:19:41 +00:00
Vadim Zeitlin
a3edb930b9 Exclude windows not accepting keyboard focus from GTK focus chain.
For some reason the test for AcceptsFocusFromKeyboard() wasn't done in the
correct place when constructing the GTK focus chain and even windows returning
false from it were still added to it.

Do not do this any more, this prevents the windows which are really not meant
to be focusable from keyboard (such as the pseudo-buttons in the generic
implementation of wxSearchCtrl) from gaining focus unexpectedly.

See #12808.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-24 22:19:37 +00:00
Vadim Zeitlin
9023040798 Replace wxControlContainer-related macros with wxNavigationEnabled<>.
Simply inherit classes which need to provide TAB navigation among their
children from wxNavigationEnabled<> and remove the now unnecessary
WX_DECLARE_CONTROL_CONTAINER() macros.

Also remove WX_INIT_CONTROL_CONTAINER(), WX_DELEGATE_TO_CONTROL_CONTAINER()
and WX_EVENT_TABLE_CONTROL_CONTAINER() which are not needed neither any more.

And remove the event tables which became empty after removing the last macro.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-24 22:19:33 +00:00
Vadim Zeitlin
7e0a200b08 Don't give focus to wxSearchButton when using keyboard navigation.
The search control buttons don't show that they have focus and are not meant
to have it anyhow as they are more control decorations than real buttons and
their functionality can be activated by pressing "Enter" or "Escape" already
from the keyboard. But giving it to them made TAB behave unexpectedly and
wrongly when wxSearchCtrl had focus.

Override AcceptsFocusFromKeyboard() to return false to correct this.

See #12808.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-24 22:19:27 +00:00
Vadim Zeitlin
e7c9d913c0 Use wxNavigationEnabled<> for keyboard navigation in generic wxSearchCtrl.
Derive generic wxSearchCtrl implementation from wxNavigationEnabled<> to
ensure that TAB navigation works correctly in it. While it did work before for
search controls without wxTE_PROCESS_ENTER style (because this wasn't handled
by this control itself at all in fact), it stopped working as soon as this
style was used in wxMSW because then the navigation was implemented by
manually calling wxWindow::Navigate() and this requires wxControlContainer
support.

Use wxNavigationEnabled<> to easily add it to wxSearchCtrl.

See #12808.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-24 22:19:23 +00:00
Vadim Zeitlin
4d98817cfa Add wxNavigationEnabled<> helper for implementing TAB navigation.
Provide a clean, public and documented way to implement proper TAB navigation
for subwindows of a composite control: instead of using various ugly and never
documented WX_XXX_CONTROL_CONTAINER macros it is now enough to simply inherit
from wxNavigationEnabled<BaseClass> to do it.

No real changes in the code as the new class is not used anywhere yet.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-24 22:19:20 +00:00
Vadim Zeitlin
d19d14c550 Ignore WM_CLOSE generated by wxMSW edit control when Escape is pressed.
Multiline edit control posts WM_CLOSE to its parent window when Escape key is
pressed inside it for some reason. This is unwanted as it totally bypasses our
logic for only closing the dialog when Escape is pressed if there is a
Cancel-like button in it, so suppress this behaviour by not letting the edit
control to get Escape at all.

Closes #12501.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-24 10:50:51 +00:00
Vadim Zeitlin
1dfe47d022 Mention that pages can't be added to wxBookCtrl more than once.
Apparently some people expect this to work although it's really not meant to.

See #13209.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-23 19:36:47 +00:00
Vadim Zeitlin
401889f079 Don't try to pop from an empty stack in wxGDIPlusContext::PopState().
Using PopState() without a previous PushState() is an error but it shouldn't
result in a crash, so add an assert guarding against it.

Closes #13197.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-23 19:36:43 +00:00
Vadim Zeitlin
5d4a050443 Remove mentions of wxCommandEvent from wxThreadEvent documentation.
wxThreadEvent doesn't derive from wxCommandEvent any more so don't say that it
does.

Also fix some grammar/wording.

Closes #13359.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-23 12:01:26 +00:00
Vadim Zeitlin
04a00346c6 Don't create an unnecessary extra button in wxMSW wxProgressDialog.
MSWCommonTaskDialogInit() now (probably since r67620) always creates a
IDCANCEL button so don't create another one in wxProgressDialog code, just
ensure that the one created by that function has the correct label (either
"Cancel" or "Close").

Closes #13358.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-23 11:59:43 +00:00
Vadim Zeitlin
4877e9bf90 Set wxDidCreatePaintDC to true even if we reused a cached wxPaintDC.
Reusing a cached wxPaintDC should count as painting the window, otherwise we
could call DefWindowProc(WM_PAINT) if WM_PAINT was generated from inside
EVT_PAINT handler (e.g. by calling wxWindow::Update()) and this validated the
entire window and no painting was really done.

In particular this fixes redrawing of wxStyledTextCtrl which does call
Update() (completely unnecessarily AFAICS) from its EVT_PAINT handler when it
wants to fully refresh itself.

Closes #13345.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 16:53:56 +00:00
Vadim Zeitlin
6c42e86d96 Increased the version to 2.9.3.
Simply ran misc/scripts/inc_release and changed build/bakefiles/version.bkl
and rebaked everything afterwards.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 16:32:07 +00:00
Vadim Zeitlin
0c63cc6e4c Update the files changed by the version number increment script.
src/wxWindows.xcodeproj doesn't exist any more so remove it but add
build/tools/bld_chm_exe.bat and samples/minimal/Info*.plist files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 16:31:55 +00:00
Vadim Zeitlin
d38eb01c91 Added customizable wxDocManager::OnMRUFileNotExist() virtual method.
This method can be overridden to customize the previously hard-coded handling
of the case when a file selected from the MRU menu doesn't exist any more: we
used to always remove it from the file history completely. This may, however,
be inappropriate and, in fact, probably never, or very rarely, is the right
thing to do when the file that we failed to open still exists.

So never remove the file from the MRU if we failed to open an existing file
(also don't give an error about it as it should have been already given by
CreateDocument()) and, while we still do it for the non-existent files, allow
to override this behaviour by overriding the new OnMRUFileNotExist() method.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 16:16:09 +00:00
Vadim Zeitlin
1ecc323f26 Several corrections to wxDocManager fields documentation.
Remove non-existent wxDocManager::m_flags.

Added correct m_lastDirectory declaration to go with its documentation instead
of the duplicated m_fileHistory documentation.

Better document the default m_maxDocsOpen value.

Put all the documented fields in protected section as they're really protected
and not public.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 16:16:06 +00:00
Vadim Zeitlin
a6b7e90b5d Save and restore file history in docview sample.
Show how the file history can be saved to and restored from wxConfig.

This makes it much easier to test file history related stuff as the history
doesn't need to be recreated during every sample run.

It is also closer to what real applications using docview framework do as the
file history is relatively useless if it's not saved.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 16:16:03 +00:00
Vadim Zeitlin
90693f47f2 Allow passing the error value to wxStreamBase::Reset().
It can be useful to induce an error on the stream explicitly, e.g. because an
incorrect value was read from it and we want to indicate it to the caller by
setting stream error to wxSTREAM_READ_ERROR.

Allow to do this by passing an optional error value to wxStreamBase::Reset().

Add an example of using the new functionality to the docview sample which
needs it to be able to signal errors while reading the files.

Also document this method that previously wasn't documented at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 16:16:00 +00:00
Julian Smart
e3bb4c547a Fixed Replace() to use the passed range instead of current selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 13:07:40 +00:00
Vadim Zeitlin
9f6e407c7d Don't pass spin text control messages processed at wx level to Windows.
Windows messages handled at wx level shouldn't be processed again at Windows
level but we always passed the events forwarded by spin control "buddy" text
window to its default window proc as we had no way to determine whether they
were really handled or not.

Now we do have a way to do, by using the newly added MSWHandleMessage(), so
only pass the messages to default window proc if they hadn't been handled
already.

This notably suppresses the annoying beep which happened if Enter key was
pressed in a wxSpinCtrl with wxTE_PROCESS_ENTER style (as used by the
corresponding wxDataViewCtrl renderer, for example). It probably corrects some
other bugs/discrepancies with the other ports in event handling in wxSpinCtrl
too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 12:49:24 +00:00
Vadim Zeitlin
2e1cee233e Refactor wxWindow::MSWHandleMessage() out from MSWWindowProc().
This commit just refactors the code without changing anything in its
behaviour and will be followed by the real changes in the next one.

The new function just handles the message, without calling MSWDefWindowProc()
if it wasn't handled. This allows to call it and determine whether the message
was really handled and only continue processing it if it wasn't.

Notice that while in theory this shouldn't be necessary because the return
value of MSWWindowProc() should indicate whether the message was handled or
not (0 meaning that it was, for most messages), in practice it doesn't work
because many standard controls window procs return 0 even for message they do
nothing with, e.g. "up down" control always returns 0 for WM_CHAR messages
even it it only really handles the arrow keys.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 12:49:22 +00:00
Steve Lamerton
7d3f6b4ded Implement basic support for virtual file systems for the ie backend. Registering a temporary namespace allows us to use the existing wxFileSystem work to load virtual files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 12:31:18 +00:00
Steve Lamerton
a1ee9e64a5 Replace define for OLECMDID_OPTICAL_ZOOM with an enum to avoid errors in compilers that define it as such.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 09:34:46 +00:00
Vadim Zeitlin
41936464fd Fix double deletion bug in wxGTK wxDVC dnd code.
The row_draggable callback could blithely delete m_dragDataObject twice as it
didn't reset it to NULL after deleting it the first time. Then, if the object
wasn't changed in the meanwhile, e.g. because dragging was not allowed for
this item, it tried to do it again when called the next time resulting in a
crash.

Closes #12538.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:50:26 +00:00
Vadim Zeitlin
3e81bbbf6c Fix the alignment used by custom wxDVC renderers in wxGTK by default.
Correctly initialize the alignment used by the text renderer used by
wxDataViewCustomRenderer in wxGTK implementation of wxDataViewCtrl.

Closes #12298.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:50:22 +00:00
Vadim Zeitlin
ff7bc95e6f Send wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED for generic version too.
Send this event when the column used for sorting changed in the generic
implementation of wxDataViewCtrl too.

Closes #13005.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:50:17 +00:00
Vadim Zeitlin
311c4a7a85 Fix drawing of expander columns not at 0 position in generic wxDVC.
The drawing code in the generic version of wxDataViewCtrl incorrectly supposed
that the expander column was always at position 0. This resulted in the
expander column not being drawn at all if it was not really the first one.

Fix the test to use wxDataViewCtrl::GetExpanderColumn() to correct this.

Closes #12870.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:50:14 +00:00
Vadim Zeitlin
4385e70296 Correct test for maximal row index in generic wxDataViewCtrl.
The comparison in EVT_CHAR handler was incorrect for an empty control without
any rows as it subtracting 1 from 0 resulted in UINT_MAX and not -1 as all the
values were unsigned.

Fix this by checking that the new row is valid instead, this is correct for
both signed and unsigned values.

Closes #13356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:50:10 +00:00
Vadim Zeitlin
26647ae4a7 Never restore focus to hidden child.
Don't set focus to a hidden window in our focus management code, this never
makes sense and results in apparent focus loss.

It also fixes, as a side effect, a crash in wxGrid under wxMSW as the focus is
not restored to the hidden grid editor any longer and so the code in its
wxEVT_KILL_FOCUS handler that resulted in the crash is not executed any
longer, see #13349.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:50:06 +00:00
Vadim Zeitlin
2b232decc5 Allow marking wxTreeBook nodes to expand initially in XRC.
Add new "expanded" attribute for XRC nodes of treebookpage class.

Also update the sample and the XRC format documentation.

Closes #13355.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:50:03 +00:00
Vadim Zeitlin
fb4faeb5de Make wxEnhMetaFileDC ctor from wxDC explicit.
This avoids implicit conversion of any kind of wxDC to wxEnhMetaFileDC which
is totally unexpected.

See #13326.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:49:59 +00:00
Vadim Zeitlin
1a63798c5a Fix parsing of negated long options in wxCmdLineParser.
Negated long options were not recognized in wxCmdLineParser::Parse(), do check
for them now.

Also extend the unit test to check for negated options.

Closes #13335.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:49:55 +00:00
Vadim Zeitlin
dd18cc6594 Reset negatable switches correctly in wxCmdLineParser::Reset().
The "negated" flag of wxCmdLineOption struct was not reset by Reset() so
parsing a command line with a negatable option once influenced the result of
parsing it the next time because the old value was kept.

Do clear it now to allow calling Parse() several times without side effects.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:49:51 +00:00
Julian Smart
6607ee151a No longer ignores first-line indent if no left indent specified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-20 16:23:37 +00:00
Vadim Zeitlin
5707e433a3 Don't use template member function in drawing sample to placate VC6.
VC6 can't instantiate member template functions so get rid of it and use ugly
dynamic casts in the non-template function to construct wxGCDC correctly.

See #13327.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-20 11:41:07 +00:00
Stefan Csomor
7a68fc9c34 fixes redraw problems under OSX, see #13345
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-20 06:36:06 +00:00
Vadim Zeitlin
5568067a3d Fix harmless gcc warning about uninitialized mask in PNG saving code.
The mask was actually only used when it was initialized (or, conversely, the
mask was always initialized when it was used) but gcc doesn't seem to notice
this and still warns that mask components "may be used uninitialized in this
function".

Suppress the warnings by always initializing the mask, even if we don't use
it.

Closes #13333.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 22:36:00 +00:00
Vadim Zeitlin
a09da78b03 Refresh the old current row when right clicking in wxDataViewCtrl.
the generic implementation of wxDataViewCtrl left the old current still
focused after selecting another row as current when it was right clicked.
Fix this by refreshing the previously current row after unfocusing it.

Closes #13330.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 22:35:57 +00:00
Vadim Zeitlin
2a648479df Add wxDataViewEvent::IsEditCancelled() and support for vetoing edit events.
Currently this is only implemented in the generic wxDataViewCtrl, the native
GTK/OSX ports should be modified to support this later.

Closes #13323.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 22:35:53 +00:00
Vadim Zeitlin
d32fb5f9f4 Fix deleting columns in wxGridStringTable with custom column labels.
We erroneously removed too many elements from m_colLabels array (basically we
always removed all the elements remaining after this column, irrespectively of
the actual number of columns to delete), fix this by removing at most the
specified number of columns -- or possibly less if the array isn't entirely
filled.

See #13329.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 22:35:48 +00:00
Vadim Zeitlin
8c6b0819ec Allow saving the drawing sample canvas to a file or clipboard.
This allows to test wxMemoryDC and, under MSW, wxMetafileDC and also can be
used to compare the output of different versions of the sample (possibly from
different ports, too).

Closes #13327.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 22:35:45 +00:00
Vadim Zeitlin
2d770c4f82 Added wxGCDC(wxEnhMetaFileDC) ctor too.
Make it possible to create wxGCDC associated with a metafile DC in wxMSW too.

Closes #13326.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 22:35:41 +00:00
Vadim Zeitlin
b64bb3ca1b Fix keyboard navigation in wxGrid with hidden columns.
The hidden columns (i.e. those whose size was set to 0) should be skipped when
find the previous/next column to select when the user presses Left/Right
cursor arrow keys in wxGrid, otherwise the focus could completely disappear as
it was invisible when it was set to a hidden column.

Closes #13281.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 22:35:37 +00:00
Stefan Csomor
3e88d48700 doing WakeUp in osx_carbon differently for the main event as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 17:56:57 +00:00
Stefan Csomor
85a74f93bf make sure we can issue a WakeUp call that really triggers at the NSRunLoop level not only only CFRunLoop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 16:17:44 +00:00
Stefan Csomor
f51afd8f40 fixing width/height (were negative) thanks to Werner Smekal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-19 10:56:04 +00:00
Vadim Zeitlin
05d65177f8 Fix memory leak in wxPanel::SetBackgroundBirmap() in wxMSW.
The brush allocated for the bitmap was never freed, do free it in dtor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-18 19:36:31 +00:00
Steve Lamerton
d363c7dbb0 Make callback names consistent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-18 09:46:32 +00:00
Steve Lamerton
780f726226 Use the newer and recommended callback for handling navigation requests in WebKitGTK+.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-18 09:37:14 +00:00
Julian Smart
1d7d04d77f VC++ 6 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-16 12:13:17 +00:00
Julian Smart
9e039c8ee4 Added makefile from Steven
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-16 11:22:28 +00:00
Václav Slavík
7243eb6d3b Add support for column header images to wxListCtrl XRC handler.
Fixes #13319 (patch).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-16 10:05:02 +00:00
Václav Slavík
d8eae94f53 Fix wxListCtrlXmlHandler so that it accepts icon with wxLC_LIST and wxLC_REPORT styles too.
Fixes #13319 (patch).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-16 10:04:57 +00:00
Václav Slavík
0915bc4d71 Fix wxXmlResourceHandler::GetImageList() to use specified size.
Fixes #13319 (patch).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-16 10:04:54 +00:00
Václav Slavík
527d2d2d47 Add check to prevent creation of element wxXmlNodes with content data.
Just like in the DOM, only text, ctype etc. nodes have textual content,
elements don't.

See #13297.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-16 10:04:48 +00:00
Stefan Csomor
7973979598 proper guard for bitmap constructors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-16 06:57:30 +00:00
Stefan Csomor
913bcbfc3d fixing typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-16 06:57:07 +00:00
Vadim Zeitlin
1715d4fef9 Implement wxRegion::Equal() for wxOSX.
As there doesn't seem to be any native functions for comparing HIShapes,
compute their differences to find out if they are equal.

Closes #13339.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-15 22:58:36 +00:00
Vadim Zeitlin
0aab87fddd Ensure we don't modify a shared object in wxOSX wxRegion::DoOffset().
Call AllocExclusive() before modifying the object.

Closes #13338.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-15 22:58:32 +00:00
Vadim Zeitlin
22aa243d58 No real changes, just use AllocExclusive() in wxOSX wxRegion.
Don't fiddle with the reference count manually, just use the base class
function doing it instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-15 22:58:30 +00:00
Steve Lamerton
2339d6dfa5 Remove some code that shouldn't be in the interface file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-15 18:49:40 +00:00
Steve Lamerton
442262d47a Send correct navigation events when using SetPage on the IE backend, they now mimic Webkit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-15 15:22:08 +00:00
Steve Lamerton
c9ccc09c64 Add RunScript and implement on all backends. Document and add a very simple unit test.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-15 12:38:47 +00:00
Steve Lamerton
41933aa5a0 Add ClearSelection for msw ie and gtk webkit, with a stub for osx webkit. Document and add to unit tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-15 09:36:08 +00:00
Steve Lamerton
0609769d3b Fix all the unit tests for gtk, they now all pass on msw with the ie backend and gtk with the webkit backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-14 19:31:21 +00:00
Steve Lamerton
18cf6bb5b4 Add unit tests for zoom functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-14 14:02:14 +00:00
Steve Lamerton
d563e28f82 Yield after control creation to allow it to load the initial page.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-14 13:33:20 +00:00
Steve Lamerton
526292e713 Update web units tests so that they compile after api change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-14 13:19:53 +00:00
Steve Lamerton
423adfde54 Fix compiler warnings in the IE backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-14 13:05:12 +00:00
Steve Lamerton
87d482ec3f Update the web sample to allow choosing between different types of zoom, text or layout.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-14 12:53:28 +00:00
Steve Lamerton
cd4e467319 Implement CanSetZoomType correctly for the IE backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-14 11:14:37 +00:00
Steve Lamerton
c5f417cb50 Overhaul IE zoom functions to support both text and optical zoom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-14 09:58:33 +00:00
Steve Lamerton
241b769f96 Add GetPageText to MSW IE and to GTK WebKit. Add stub for OSX and document.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-13 17:25:05 +00:00
Steve Lamerton
97ba4d81a8 Rename GetSelectedHTML to GetSelectedSource, this brings it into line with GetPageSource, and also with its intended use.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-13 15:30:25 +00:00
Václav Slavík
a1c9e7d143 Better sizing in wxDataViewSpinRenderer and wxDataViewChoiceRenderer.
Their GetSize() method used hardcoded size of (80,16). Instead, use
GetTextExtent() to compute the size from content, as should be done. Add
some extra room for editor control's extra parts. The space needed isn't
computed exactly, as that would be quite convoluted (and in the end,
most likely not 100% accurate even then), using a simple approximation
instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-13 08:32:17 +00:00
Vadim Zeitlin
7ecc7eb6be Use native hint wxTextCtrl support in wxSearchCtrl.
Instead of using broken emulation of the support for hints available in the
text control, use the real wxTextCtrl::SetHint() for SetDescriptiveText()
implementation in the search control.

This looks better and, more importantly, fixes the bug when searching for the
string equal to the current descriptive text searched for an empty string
instead.

Closes #13324.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-12 09:13:43 +00:00
Vadim Zeitlin
b748750e13 Centre wxSlider value correctly when wxSL_MIN_MAX_LABELS is not used.
r68230 fixed the width of the value label in this case but not its position:
it was left-aligned instead of being centered as it should be.

See #13291.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-12 09:13:39 +00:00
Vadim Zeitlin
1bf9327b5d Document wxEnhMetaFileDC-related wxGraphics functions.
Closes #13325.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-12 09:13:36 +00:00
Steve Lamerton
a9c153392c Update selection unit test to test GetSelectedHTML.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-12 08:41:11 +00:00
Vadim Zeitlin
16e79d4879 Fix showing slider label in wxMSW when wxSL_MIN_MAX_LABELS was not used.
wxSlider with wxSL_LABELS style but without wxSL_MIN_MAX_LABELS didn't show
the current value because the width of the value label was 0.

Fix this by always computing the widths of min and max labels and using the
longest of them for the value label, even if we don't actually show them.

Closes #13291.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 22:49:33 +00:00
Vadim Zeitlin
5db9025368 No real changes, just make some wxSlider members local variables.
wxMSW wxSlider implementation stored the min and max labels widths as fields
of wxSlider object for some reason even though they were only used in one of
its methods (and can be easily computed anyhow).

Make them simple local variables instead and also rename an existing local
variable which started conflicting with their new names.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 22:49:30 +00:00
Vadim Zeitlin
c3b8a19638 Fix and improve documentation of wxT_2() macro.
Documentation for wxT_2() applied to wxS() instead, fix this. Also correct the
wording and add @since tags.

Closes #13321.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 22:49:26 +00:00
Vadim Zeitlin
efaf786535 Don't handle "Return" key as "TAB" even when the default button is disabled.
wxMSW used to handle VK_RETURN in the same way as VK_TAB if it wasn't consumed
by the default push button but this didn't correspond to the native platform
behaviour which considers pressing Return when the OK button is disabled an
error and audibly notifies the user about it.

Fix this by passing VK_RETURN to IsDialogMessage() if we don't translate it to
a button click.

Also add a possibility to test what happens when the default (or all)
button(s) in the dialog are disabled to the dialogs sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 22:25:24 +00:00
Steve Lamerton
0fe8a1b6ca Implement GetSelectedHTML for the ie and gtk webkit backends and document.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 18:26:07 +00:00
Vadim Zeitlin
550d5748b1 Copy recently added wxGenericValidator fields in Copy().
The pointers added in r68217 must be also initialized when creating a copy of
the validator.

Closes #13304.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 14:51:32 +00:00
Steve Lamerton
3dffc2aea2 Fix various gtk webkit warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 12:52:07 +00:00
Steve Lamerton
7fbc727b20 Tidy up the ie backend a little, make sure all com objects are correctly released.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 11:21:05 +00:00
Steve Lamerton
22ca10faec Fix warnings in the ie backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 09:35:41 +00:00
Steve Lamerton
c9355a3df6 Add support for retrieving the currently selected text. Implement on all backends, document and unit test.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-10 18:11:43 +00:00
Stefan Csomor
24e059c32c support multi-line labels, add different native styles for buttons as we did for bitmap buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-10 14:20:45 +00:00
Vadim Zeitlin
0a63a7b38f Use the correct event handler in wxMenuBase::UpdateUI().
Use GetWindow() instead of GetInvokingWindow() to send the event to the
associated window for the menus that are part of the menu bar and not only the
popup ones. This was broken since r64127 because GetInvokingWindow() is now
only used for the popup menus.

Closes #13317.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-10 12:55:30 +00:00
Vadim Zeitlin
e96be167e7 Support float, double and file name values in wxGenericValidator.
Currently these values can only be read from/written to wxTextCtrl but support
for other controls (e.g. wxSpinCtrlDouble for float/double) could be added in
the future.

Closes #13304.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:37:28 +00:00
Vadim Zeitlin
065ba6fb09 No changes, just use NULL instead of 0 for pointers.
Initialize pointers with NULL in wxGenericValidator.

See #13304.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:37:21 +00:00
Vadim Zeitlin
e7cda1c350 Generate events for two auxiliary mouse buttons in wxGTK.
Add code to generate wxEVT_AUXN_XXX events to wxGTK.

Closes #13310.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:37:15 +00:00
Vadim Zeitlin
013b02092f Mention that wxNotebook page must be removed before reparenting it.
At least in wxGTK it is necessary to remove the page from the notebook first
as reparenting it doesn't work otherwise currently.

This should ideally be fixed but in the meanwhile at least document it.

See #13305.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:37:09 +00:00
Vadim Zeitlin
0edbdf6a45 Check for GTK window parent, not wx one, when reparenting.
A notebook page removed from its notebook can have a non-NULL wx parent but
not have any parent at GTK level any longer, so test for the window parent at
GTK level before removing the widget from it, otherwise we were getting GTK
asserts when trying to remove a window from its no-more-parent.

See #13305.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:37:03 +00:00
Vadim Zeitlin
cd9b34ef83 Refresh the generic wxDataViewCtrl header if it was made too small.
Although normally the control header is not supposed to be resized below its
minimal vertical size, sometimes this can still happen and in this case ugly
artefacts were displayed because it wasn't refreshed properly. Do refresh it
to avoid them.

Closes #13313.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:36:55 +00:00
Vadim Zeitlin
dcd6f73654 Show extra mouse buttons and wheel state in the text sample output too.
Do it for consistency, as the state of all the other buttons is already shown,
and also to have some place for testing this functionality.

Closes #13309.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:36:50 +00:00
Vadim Zeitlin
0e27ef576e Don't duplicate wxImage::ConvertToDisabled() in wxAUI code.
Just reuse the existing function.

Also add an example of showing a disabled bitmap to the aui sample.

Closes #13303.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:36:44 +00:00
Vadim Zeitlin
1719a200c7 Output something from the console sample even if it's ran without arguments.
Running console sample without parameters didn't do anything by default and
didn't output anything neither which was presumably rather confusing. Do
output a welcome message at least to indicate that something happened.

Closes #13299.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:36:38 +00:00
Vadim Zeitlin
fd2eccd140 Immediately update MSW cursor when ::SetCursor(wxNullCursor) is called.
The cursor was previously reverted to the default one only when a next mouse
event was received. Do it immediately now to e.g. avoid showing the busy
cursor when the program is not busy any more.

Closes #12961.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:36:32 +00:00
Vadim Zeitlin
c12d4e1dac Fix wxMSW wxSlider best size calculation and label layout.
The best size calculation was wrong as the min/max labels height was
unnecessarily added to the slier total height even if though these labels are
positioned alongside the slider itself in horizontal layout case.

The slider also managed to position its value label completely outside the
space allocated to it (and the bug in DoGetBestSize() might have been an
attempt to work around this), don't do this any more. This also fixes the
wrongly centered vertical position of the min/max labels.

Closes #13291.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:36:26 +00:00
Vadim Zeitlin
ebcdce46d2 Make coordinates transformations in wxDC really maximally precise.
Use the maximal device space extent supported by Win32 GDI and only decrease
it if the scale is so small that keeping the device space extent maximal would
result in overflowing the int range for the logical space.

This makes coordinate translations exact even for huge coordinates, while they
could be significantly wrong before due to the integer rounding errors.

Closes #13284.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 23:36:19 +00:00
John Chain
fcd9ed6c37 Added Robin Dunn's explanation on the relationship of wxBitmap and wxImage into interface doxygen section
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 18:40:11 +00:00
Steve Lamerton
63a6507091 Add start of selection api, support for HasSelection, SelectAll and DeleteSelection along with documentation. Implement for IE and WebKitGTK and add stubs for OSX WebKit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 14:31:29 +00:00
Stefan Csomor
930d20e710 avoid scrolling to cleared-non existing- data, reload before, fixes #13318
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 06:37:14 +00:00
Steve Lamerton
c7cbe308f6 Add the ability to enable / disable and check for the editable property of a rendering engine. Implement for all three backends and extend the sample, document and unit test.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-08 19:34:56 +00:00
Steve Lamerton
3ce14be7b9 Factor out url loading logic into a separate function to reduce repetition.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-08 14:46:51 +00:00
Steve Lamerton
1a693ec8d9 Add tests for the back and forward history lists.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-08 14:35:49 +00:00
Steve Lamerton
f152b4b93f Add unit tests for history clearing and enabling / disabling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-08 14:21:46 +00:00
Steve Lamerton
d07fd8b021 Add tests for url and history support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-08 13:11:17 +00:00
Steve Lamerton
6a2ef29f66 Add tests for the page title
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-08 10:51:15 +00:00
Steve Lamerton
2dad08eca5 Add scaffolding for wxWebView unit tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-08 08:19:25 +00:00
Vadim Zeitlin
53d4bdbc15 Add wxDCImpl::MSWApplyGDIPlusTransform() to formalize wxRendererMSW hack.
Replace the dynamic_cast<> used in wxMSW wxRenderer implementation code with a
virtual function call.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-07 13:05:22 +00:00
Vadim Zeitlin
6c0e710f00 Make wxGCDC::GetGraphicsContext() const.
There is no reason for this accessor to not be const and it prevents other
methods using it from being const too, so change this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-07 13:05:16 +00:00
Stefan Csomor
e328846969 allow NULL parent menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-06 11:02:38 +00:00
Steve Lamerton
028894b426 Implement cut / copy / paste in osx webkit and fix the function stubs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-06 10:20:03 +00:00
Steve Lamerton
e2392c4533 Add some more missing stubs to the osx webkit backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-06 09:45:29 +00:00
Steve Lamerton
0e37936eb4 Add stubs to osx webkit backend to allow compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-05 17:06:12 +00:00
Steve Lamerton
9df97be2c1 Simplify backend enum naming, we do not need separate values for gtk and osx webkit backends. Simplify factory creation code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-05 15:33:42 +00:00
Steve Lamerton
05552dd726 Remove comment about a new frame api as this is now offered.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-05 14:19:38 +00:00
Steve Lamerton
0a6c851624 Bring osx class naming into line with the other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-05 13:57:44 +00:00
Steve Lamerton
25b7299d16 Remove out of date osx defines.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-05 13:40:00 +00:00
Steve Lamerton
66243a8e4b Add osx configure support for wxWebView.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-05 11:06:33 +00:00
Chris Elliott
7c6a2a598c for 2.9.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-05 09:22:58 +00:00
Vadim Zeitlin
4b876233c8 Improve the description of the available files in readme.
Be more clear about what is provided. Add more URLs, everybody likes to click
them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 21:26:11 +00:00
Vadim Zeitlin
dc0a2ff4bf Remove the note about wxUSE_STD_CONTAINERS.
We finally didn't switch to using the standard containers by default so don't
leave misleading information in the change log (this should have been part of
r67735).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 21:13:26 +00:00
Vadim Zeitlin
0aae39efd2 Fix crash when getting or setting wxComboBox value in wxUniv.
Forward DoGetValue() and SetValue() to the associated wxTextCtrl.

Closes #13298.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 21:09:24 +00:00
Steve Lamerton
617227c309 Factor logic that returns an IHTMLDocument2 into a separate function to reduce repetition.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 18:46:01 +00:00
Steve Lamerton
113e0a926f Filter out subframes from the ie backend history and the sample. Also document that many wxEVT_COMMAND_WEB_VIEW_LOADED events may be sent, one for each frame.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 18:27:14 +00:00
Vadim Zeitlin
4e32015c90 Fix event types in wxMouseEvent::Aux1DClick() and Aux1DClick().
wxEVT_AUX[12]_UP were wrongly used instead of the correct wxEVT_AUX[12]_DCLICK.

Closes #13308.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 17:22:49 +00:00
Vadim Zeitlin
026f3f9bc3 Fix warnings about implicit double to int conversions in propgrid.
Use wxRound() instead of implicit casts to convert double to int. This not
only avoids warnings (e.g. when using g++ with -Wconversion) but also should
be (marginally) more precise.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 16:43:40 +00:00
Vadim Zeitlin
47e442de38 Fix harmless warning about double to long long conversion.
Work around g++ -Wconversion warning by writing out the casts explicitly.

A better solution would be to have wxLongLong::FromDouble() static function
but it would have to be done after 2.9.2.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 16:43:37 +00:00
Vadim Zeitlin
6a06eecfb2 Suppress some harmless warnings about unused parameters in wxOSX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 14:05:14 +00:00
Vadim Zeitlin
51909b8b0b Also accept VT_R4 (float) VARIANTs in wxMSW OLE code.
We don't support creating VT_R4 VARIANTs as wxVariant can only contain double,
not float, but we can still at least accept them on input.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 14:05:11 +00:00
Steve Lamerton
c36818c8e3 Add a note to the documentation about the emulation modes of the ie backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 11:34:33 +00:00
Vadim Zeitlin
fdd67a6a50 Fix crash in wxDataViewProgressRenderer in non-Unicode build.
We can't use the column pointer in wxDataViewProgressRenderer ctor as it's not
set yet, so postpone setting the renderer label until later in non-Unicode
build which needs the font used by this column to do the conversion to UTF-8.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 09:03:00 +00:00
Vadim Zeitlin
0cc1991e2a Add wxUSE_UNICODE guard around wxDF_UNICODETEXT in the sample.
Unicode text is not supported in non-Unicode builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 09:02:57 +00:00
Steve Lamerton
bf39189b1e Add web documentation category.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 17:11:46 +00:00
Steve Lamerton
977c53206a Get the page title from the IHtmlDocument rather than the bowser as it actually returns the title rather than the url.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 16:41:51 +00:00
Steve Lamerton
968a7de2c5 Overhaul the wxWebView documentation. Split the documentation into sections and add documentation for clipboard and history functions. Add documentation for wxWebHistoryItem. Fix many spelling mistakes. Alphabetise the function names. Add missing svn properties.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 16:24:56 +00:00
Steve Lamerton
97e49559fb Implement undo and redo for the ie and gtk webkit backends. Extend the sample to show their use.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 15:07:46 +00:00
Steve Lamerton
ae26e17b93 Implement clipboard api in gtk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 14:32:02 +00:00
Steve Lamerton
4681a3ea0d Add new clipboard api and support for it in the ie backend. Also extend the sample to demonstrate the new functions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 11:45:19 +00:00
Vadim Zeitlin
bbd783e0b2 No real changes, just remove trailing commas from enum.
wxCompositionMode enum had a trailing comma not allowed by C++ 98 (and which
would result in warnings or errors with g++ pedantic switch).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 10:29:14 +00:00
Vadim Zeitlin
fec4e45897 Add wxCOMPOSITION_INVALID mode and use it to simplify the code.
Having an invalid element in wxCompositionMode enum allows to directly return
it from TranslateRasterOp() function instead of needing a separate bool
parameter to indicate that a ROP couldn't be translated.

This also incidentally fixes warnings about possibly uninitialized variables
in optimized g++ builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 10:29:11 +00:00
Vadim Zeitlin
749f13d4a2 Avoid g++ warnings about breaking strict aliasing rules in wxTreeCtrl.
The standard TreeView_GetItemRect() macro resulted in warnings about breaking
strict aliasing rules as it passed a variable of one type via a pointer to
another one. Fix this by using a union and our own custom macro instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 10:29:07 +00:00
Steve Lamerton
19fc1a2f0d Implement extended history api in gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-01 19:46:31 +00:00
Paul Cornett
3ca5da9357 Don't cause scroll events for position changes from SetScrollbars, broken in r67326.
Fixes #13301

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-01 17:44:49 +00:00
Steve Lamerton
5cbda74b66 Extend history api using the ie backend to include loading history items, and getting the backward and forward history lists.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-01 10:57:37 +00:00
Steve Lamerton
3e7968c2da Use shared pointers throughout when managing history with the ie backend, simplifying memory management. Also add more comments explaining how the history is managed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-01 10:01:45 +00:00
Steve Lamerton
60ec28290b Add an extra assert in the case of trying to load an invalid history item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-01 07:54:49 +00:00
Vadim Zeitlin
e4e1626cbb Mention the EOL issue in readme.txt.
Emphasize that building Windows archives under Unix *or vice versa) is not
supported.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 21:31:39 +00:00
Steve Lamerton
74af0b1343 Add support for the new history functions to the ie backend. For this we manage our own history as there are no suitable built-in ways of managing it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 19:57:26 +00:00
Steve Lamerton
3ee442ff1a Only send a document complete event when the page is completely loaded, as opposed to with every frame. This brings the event in to line with what is emitted by webkit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 15:07:52 +00:00
Chris Elliott
474aa33ee2 update docs for windows checkout process 2/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 13:20:55 +00:00
Chris Elliott
2350919764 update docs for windows checkout process 1/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 13:17:51 +00:00
Vadim Zeitlin
d883acaaa0 Initialize variable in UTF{16,32} conversion code to avoid warnings.
In optimized build g++ warned about the second element of two-element array
passed to encode_utf16() being possibly uninitialized. This wasn't really the
case but change the code just to avoid the warnings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 12:20:54 +00:00
Vadim Zeitlin
decd390a32 Work around bogus g++ warnings about possibly missing return.
OS X g++ warned that "control may reach end of non-void function" in
wxRichTextHelpInfo::ShowHelp(). This wasn't really the case but change the
function logic slightly to (hopefully) suppress the warning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 12:20:47 +00:00
Vadim Zeitlin
e2250d6417 Fix harmless warning about unused variable in isosurf sample.
Don't declare and initialize a variable that we never use.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 12:20:38 +00:00
Vadim Zeitlin
bb504ee3c3 Fix warning about hiding a virtual function in propgrid sample.
The virtual ColourToString() method was hidden and not overridden in the
sample because it didn't use the last argument of the base class method.

Fix this in the most straightforward (albeit not necessarily the most correct)
way to at least ensure that the function is really overridden.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 12:20:29 +00:00
Steve Lamerton
152a58083f Add basic history api and implement it under gtk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 10:03:25 +00:00
Vadim Zeitlin
99ef43728a Change the loop condition to avoid comparing unsigned value with 0.
This resulted in (useful) g++ warning and didn't make any sense in any case.

Check for the loop variable value being 0 at the end of the loop instead now.
If the old code was correct it shouldn't change its behaviour and if not, this
might fix a bug.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 17:50:32 +00:00
Vadim Zeitlin
b02d50281d Always initialize SelectInHDC::m_hgdiobj in wxMSW.
Leaving m_hgdiobj uninitialized probably didn't result in any problems
considering how this class is currently used but it did result in g++ warnings
about uninitialized member with aggressive warning flags and also could easily
become a problem in the future so just ensure that we always initialize it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 17:50:30 +00:00
Vadim Zeitlin
917b008579 Fix two harmless gcc warnings about missing initializers.
Add values to make g++ -Wmissing-field-initializers warnings (implicitly
enabled by -Wextra) go away.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 17:50:27 +00:00
Vadim Zeitlin
408ee837a8 Mention that readme.txt needs to be updated before a release.
Hopefully this means it won't be forgotten the next time.

Also mentioned that the new docs.wxwidgets.org link should be now already
created when the release is being done.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 17:50:08 +00:00
Vadim Zeitlin
273a28a1e9 Add a tiny script for producing HTML documentation archives.
Also update the release making document to point to it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 17:50:05 +00:00
Vadim Zeitlin
7e1fbe6913 Fix typo in error message about incorrect syntax.
Output the error to stderr, not a file called "2".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 17:50:02 +00:00
Vadim Zeitlin
8563b81134 Update the readme file for 2.9.2.
Just increment version number and year in a couple of places.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 17:49:59 +00:00
Steve Lamerton
9a00d07834 Give the sample a more sensible initial size for web browsing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 16:09:52 +00:00
Steve Lamerton
61635eed82 Adjust animation size to fit the toolbar properly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 16:04:42 +00:00
Steve Lamerton
62e8551fa0 Update the sample to show how to block navigation and new window events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 12:03:36 +00:00
Chris Elliott
8295be2116 fix misisng html format files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 11:33:13 +00:00
Steve Lamerton
dffce0bd58 Update the web sample to use images from the art provider if possible. Scale existing images down to 24x24 so that this fit better with the art provider images.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 09:27:11 +00:00
Vadim Zeitlin
7b1a29ce00 Updated copyright year before 2.9.2 release.
Use 2011 instead of 2010 in the manual and in several .plist files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 09:22:35 +00:00
Chris Elliott
a059d81b64 2.9.2-rc1 in file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 08:46:13 +00:00
Vadim Zeitlin
4ce59b1f90 Replace stc.{h,cpp} with the generated versions with all their typos.
Revert the changes of r67280 which fixed several typos in these files as they
were getting modified each time gen_iface.py was rerun and we don't want to
touch the original Scintilla files to fix these typos.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 08:37:49 +00:00
Vadim Zeitlin
f2b099261f Generate code using IsOk() instead of Ok() in stc.cpp.
Modify the script generating this file itself to produce IsOk() instead of
Ok(). This replaces the changes of r67681 which only modified the generated
file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 08:37:46 +00:00
Steve Lamerton
9ef101cd55 Add support for loading a url in the constructor to the ie backend and update the sample to use it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 08:27:33 +00:00
Steve Lamerton
0016bf1df1 Add support for new window events in gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 08:09:47 +00:00
Václav Slavík
c1b293bb8d Move wxThreadEvent into wxBase.
For this, it cannot derive from wxCommandEvent. Extracted the bits
from wxCommandEvent useful for passing data between threads into
wxEventBasicPayloadMixin helper class shared by both.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-28 17:24:37 +00:00
Steve Lamerton
b5374b5cfa Don't use a depreciated method for loading a url.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-28 17:06:28 +00:00
Steve Lamerton
b64b4e70f1 Bring gtk class naming into line with the new naming scheme by dropping the gtk part.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-28 16:57:49 +00:00
Steve Lamerton
66f2aa61c3 Update msw files to use the new definitions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-28 16:11:00 +00:00
Steve Lamerton
ea1795398a Fix the build system in gtk, plus a couple of compilation errors. wxWebView now successfully builds under gtk and the sample runs correctly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-28 15:15:51 +00:00
Vadim Zeitlin
4db97e24f5 Add support for child documents to docview framework.
Child documents are virtual documents corresponding to parts of their parent
document which can't be saved nor loaded independently of their parent and are
closed when the parent is closed.

This finally makes some use of wxDocument::m_documentParent field which was
always present in the docview code but never used before.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-27 00:09:37 +00:00
Stefan Csomor
9f3b6638e4 bringing target naming in line with other projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-25 07:16:55 +00:00
Robin Dunn
fc2f6088e7 Paper size fix for wxOSX-cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-25 00:15:00 +00:00
Vadim Zeitlin
630d8c1998 Fix code reading from the pipe stream in exec sample.
We must be reading bytes, not (wide) characters.

Closes #13290.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-24 13:10:23 +00:00
Steve Lamerton
726cc8697c Fix a number of mingw compile errors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-23 20:44:19 +00:00
Stefan Csomor
175b0dbe82 adaption to new configurations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-23 16:05:08 +00:00
Vadim Zeitlin
5d4c2acaca Update printing sample to compile again after r68026.
The sample was using Initialize() overload that doesn't exist any longer, use
InitializeWithModality() instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-23 08:02:12 +00:00
Vadim Zeitlin
ab2ef6e0e6 Fix bug with out of range date in wxMSW wxDatePickerCtrl under XP too.
The bug fix of r67990 relied on DateTime_SetSystemtime() returning FALSE if
setting the date failed but, unfortunately, this function doesn't behave
correctly under XP (and presumably earlier systems) and returns TRUE even if
it didn't actually change the date because it was out of range.

Implement an alternative solution not relying on this function return value
but simply checking the range ourselves.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 22:58:11 +00:00
Vadim Zeitlin
1e5ad6e1d1 Restore wxPreviewFrame::Initialize(void) and add InitializeWithModality().
The changes of r67619 changed the signature of the virtual Initialize() method
and in doing so broke the existing code overriding it. Avoid this problem by
restoring the old method signature and adding a function with a different name
providing the new functionality.

Also notice in the documentation that there is no real need to override
Initialize() in any case (but this doesn't change the fact that there is
existing code that does do it).

See #13108.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 22:58:07 +00:00
Vadim Zeitlin
adfbce4fec Use strdup() even in strict ANSI mode with MinGW.
MinGW headers define MSVC-compatible _strdup() even in strict ANSI mode so we
can always use it with MinGW.

This fixes a linking problem when wx itself was built without strict ANSI but
the program using it does use strict ANSI mode (e.g. due to the use of
-std=c++0x g++ option).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 22:58:04 +00:00
Vadim Zeitlin
c346d3d299 Avoid crash on startup when using single mode in docview sample.
The view doesn't have any associated frame when using the special "single
view" mode in the sample, so don't try to show it when creating a new view.

This resulted in a crash when starting the sample with --single command line
parameter.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 22:57:59 +00:00
Stefan Csomor
1aa727618e carbon prebuilt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 20:21:30 +00:00
Stefan Csomor
c55a90a22d new settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 20:19:35 +00:00
Stefan Csomor
a3c4268040 wxcocoa prebuilt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 19:45:02 +00:00
Stefan Csomor
854ad5ac3d new settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 19:41:15 +00:00
Stefan Csomor
3470df081b new settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 17:40:41 +00:00
Stefan Csomor
d7418f1414 new settings, removing incorrect setup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 17:11:46 +00:00
Stefan Csomor
7105d78058 new settings for iphone
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 17:10:08 +00:00
Stefan Csomor
bd95a56385 new settings for iphone
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 17:09:56 +00:00
Stefan Csomor
de6e978207 adding new xcconfigs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-22 16:15:59 +00:00
Julian Smart
77ea6c48d3 Fixed shift-click selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-21 09:56:32 +00:00
Stefan Csomor
225efd6d48 set default deployment and compiler flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-21 09:01:21 +00:00
Stefan Csomor
20d2c191c4 set default deployment and compiler flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-21 08:57:05 +00:00
Stefan Csomor
1fb05ae58a use same flags as command line build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-21 08:55:05 +00:00
Vadim Zeitlin
5f899cbe91 Fix bug when setting an out of range date in wxMSW wxDatePickerCtrl.
The internally stored date value was getting out of sync with the real date in
the control itself when SetValue() was called with a date out of the currently
set range. This resulted in an assert failure and other unpleasantness later.

Fix the bug and add a unit test checking for it (and also with some other
basic wxDatePickerCtrl checks).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-19 22:46:45 +00:00
Vadim Zeitlin
a5f226861c Extract wxDateTime-related cppunit helpers in a separate header file.
No real changes, just refactor the code to allow using CPPUNIT_ASSERT_EQUAL
with wxDateTime in other tests in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-19 22:46:42 +00:00
Vadim Zeitlin
58daa7b264 Document surprising behaviour of wxDatePickerCtrl::GetRange() in wxMSW.
wxMSW native control always has a built-in lower limit as MSW doesn't support
the dates before the year 1601 so wxDatePickerCtrl::GetRange() always returns
a valid range start, even if SetRange() hadn't been called to set it.

As this can be unexpected, document this behaviour clearly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-19 22:46:39 +00:00
Vadim Zeitlin
106f0d98f8 Implement wxCalendarCtrl::SetDateRange() in the native GTK version.
While GTK+ doesn't support imposing ranges for dates selection natively, we
can do it ourselves by preventing the user from selecting any date outside of
the currently valid range.

This allows to use ranges under all platforms and not only in wxCalendarCtrl
itself but in wxDatePickerCtrl as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-19 22:46:36 +00:00
Vadim Zeitlin
459c6f2a8a Suppress harmless gcc warnings about enum elements unhandled in switch.
Latest mingw64 MinGW compiler has the headers required for enabling
wxUSE_DBGHELP, fix the warnings given by g++ when compiling wxDbgHelpDLL code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-19 22:46:32 +00:00
Paul Cornett
af806b13aa fix GTKGetLabel() and DoApplyWidgetStyle(): children are GtkWidget, not GtkBoxChild
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-19 20:52:26 +00:00
Stefan Csomor
21201af6d5 adding universal as devices
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-18 19:40:22 +00:00
Stefan Csomor
ed161aa6c2 adding universal as devices
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-18 16:47:37 +00:00
Stefan Csomor
80982c3bc6 adding instantiated xcodeproj
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-18 16:46:42 +00:00
Stefan Csomor
27c86437b9 removing obsolete flags, switching to universal builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-18 15:53:10 +00:00
Stefan Csomor
2ebfa9c04c fixing iphone build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-18 15:23:39 +00:00
Stefan Csomor
23dad6aac2 updating project format to 3.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-18 14:30:10 +00:00
Stefan Csomor
530c2b7473 removing old settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-18 14:21:13 +00:00
Vadim Zeitlin
bb60690d1d Fix g++ warnings about initialized variables being declared extern.
Don't declare variables extern when initializing them, this is already the
case implicitly anyhow and explicit "extern" results in g++ warnings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-17 21:53:32 +00:00
Vadim Zeitlin
6a5f121bf9 Use GdipStringFormatCachedGenericTypographic hack for MinGW as well.
When using GDI+ with MinGW, the same hack as for Cygwin is needed (see r66787)
as it uses the same w32api headers and libraries for GDI+ support (if it has
them at all).

See #11716.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-17 21:53:28 +00:00
Vadim Zeitlin
49d2c0adc3 Don't use __declspec(dllexport) for MinGW gcc 4.5 and later.
Due to the changes in gcc 4.5, copies of dllexported inline functions are now
generated in all object files including their declarations, increasing their
sizes tenfold, and they are also now instantiated in the DLL itself increasing
its size fourfold. Moreover, linking such a gigantic DLL requires inordinate
amounts of memory and takes a very long time, see some statistics at
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43601.

To avoid all these problems, don't use dllexport at all any more but rely on
binutils support for auto export/import which seems to work fine and results
in much smaller DLLs which are created much faster.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-17 21:53:26 +00:00
Vadim Zeitlin
eeac2326b0 Avoid problems with conflicting UINT16 definitions in Cygwin headers.
UINT16 is incorrectly defined inside Gdiplus namespace in w32api gdiplus.h
used by Cygwin and MinGW resulting in compilation errors about ambiguous
symbols.

Fix this by forcefully redefining UINT16 in our own code.

Closes #13113.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-17 21:53:22 +00:00
Vadim Zeitlin
ff8a5f3d77 Fix wxStringOutputStream in wxUSE_UNICODE_UTF8 build.
For some reason the conversion of the bytes written to this stream to Unicode
was only done in wxUSE_UNICODE_WCHAR build but not in wxUSE_UNICODE_UTF8 one.
Do it in any wxUSE_UNICODE build now.

This allows to use wxStringOutputStream under Unix again, in particular it
fixes an assert in samples/html/zip when trying to load the raw contents of a
ZIP file in wxHtmlWindow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 16:22:15 +00:00
Vadim Zeitlin
31eb730728 Italian translations update from Roberto Boriotti.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 16:14:01 +00:00
Vadim Zeitlin
dac2ee8dee Disable wxFileSystemWatcher in configure if threads are disabled.
wxFileSystemWatcher requires threads under MSW so disable it automatically in
configure if --disable-threads was used to avoid compilation errors in
wx/msw/chkconf.h later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 15:19:55 +00:00
Vadim Zeitlin
3d55f45e94 Suppress various harmless warnings in MinGW build with -Wconversion.
No real changes, simply add casts to make the implicit conversions that g++
warns about when using -Wconversion explicit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 15:14:02 +00:00
Vadim Zeitlin
616ad49187 Make wxUIActionSimulator mouse move events marginally more precise.
Round the values instead of truncating them when converting from pixel values
to Win32 ::mouse_event() 0..65535 scale. This probably doesn't make any real
difference in practice but seems more correct and also avoids g++ warnings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 15:13:59 +00:00
Vadim Zeitlin
53d7ab9545 Use symbolic WAIT_FAILED constant instead of raw -1.
No real changes, just make the code slightly more readable by using a symbolic
constant instead of a magic value.

This also avoids g++ warnings about implicit conversion of a signed value (-1)
to unsigned type (DWORD).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 15:13:56 +00:00
Vadim Zeitlin
1fdce0aeb9 Round the values in wxDC coordinate calculations.
Make the conversion of logical coordinates to the device ones more precise by
avoiding errors due to truncation of floating point values to integer ones.

See #13284.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 15:13:52 +00:00
Vadim Zeitlin
f76c3ff677 Round font sizes in AdjustToSymbolicSize() instead of truncating.
This was mainly done to suppress g++ warning about implicit float to int
conversion but it also seems to make more sense to round the value here
instead of truncating it to int.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 15:13:49 +00:00
Jouk Jansen
db06cdc08c add src/gtk/anybutton.cpp to OpenVMS makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 09:07:13 +00:00
Robin Dunn
fc85e0db36 Use wxAnyButton's DoGetBestSize for toggle buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-16 00:43:22 +00:00
Vadim Zeitlin
bc927c9a8c Generic wxHyperlinkCtrl appearance and behaviour improvements.
Show focus rectangle around the control when it has focus. Also handle the
space key to trigger the link.

Also allow using either the native or generic version of the class in the
widgets sample.

Closes #11285.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-15 21:56:23 +00:00
Vadim Zeitlin
da8eb5f5bb Don't crash in wxOSX wxTextEntry if the window wasn't created yet.
Assert instead of crashing in wxTextEntry method if the associated window
hadn't been fully created yet.

Closes #13218.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-15 21:56:18 +00:00
Vadim Zeitlin
42440b08ea Fall back to the valid normal bitmap if no state-specific bitmap is set.
After the recent changes we could try to use an invalid bitmap in wxMSW toggle
button code as GetNormalState() could return State_Pressed and then we used
the bitmap for the pressed state unconditionally even if it wasn't set.

It seems more correct to always fall back to the normal bitmap as the pressed
state is already taken into account by GetButtonState().

This fixes unit test failures under MSW after the button classes refactoring.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-15 21:31:48 +00:00
Vadim Zeitlin
8770af492a Fix keyboard navigation in wxGrid with reordered columns.
Don't mix up column internal indices and display positions in wxGrid keyboard
navigation code.

This ensures that pressing left/right cursor arrows always moves the cursor to
the previous/next column on the display, even if the columns were reordered.

Closes #13281.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-15 13:33:10 +00:00
Vadim Zeitlin
2c6d6dfe60 Rename some parameters in wxGrid code to make them more clear.
No real changes, just call the variables containing display positions "pos"
and not "line" in wxGridOperations to avoid giving the impression that they
contain indices.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-15 13:33:07 +00:00
Vadim Zeitlin
c0866512a7 Fix crash when creating and quickly destroying a wxTLW in wxGTK.
Don't crash in timer callback added to work around broken Ubuntu 11.04 WM,
remove it when the window is being destroyed.

This corrects a crash which happened if a TLW was created and destroyed before
this timer had time to fire under Ubuntu.

Closes #13146.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-15 13:33:02 +00:00
Julian Smart
8c636fd789 Removed header guards
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-15 13:14:41 +00:00
Julian Smart
5219cf0588 Caret dropout fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-15 07:54:41 +00:00
Robin Dunn
888cd68347 wxButtonBase::GetDefaultSize is declared but not implemented in the wxOSX-cocoa port. Add an implementation that uses wxAnyButton::GetDefaultSize.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-14 22:19:09 +00:00
Steve Lamerton
324c132b1e Add wxWebView backend wxUSE_ macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-14 21:15:20 +00:00
Vadim Zeitlin
b4354db179 Refactor wxButton and wxToggleButton to derive from wxAnyButton.
Introduce wxAnyButton class, a common base class for wxButton and
wxToggleButton, allowing to reuse the same implementation for them.

This also allows to implement support for bitmaps in wxToggleButton for all
platforms and make wxBitmapToggleButton a trivial subclass of it everywhere,
similarly to wxBitmapButton and wxButton.

Closes #13198.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-14 13:00:42 +00:00
Stefan Csomor
eaa9e06d92 adding docset processing instructions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-12 03:39:17 +00:00
Stefan Csomor
2db79d106c adding lighter css variant for xcode docsets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-12 02:47:24 +00:00
Vadim Zeitlin
0f4a54a655 Implement wxDataViewCtrl::SetRowHeight() for wxGTK.
Also document that this method can only be used to increase the row height
compared to the default, not to make it smaller.

See #12749.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-11 23:56:44 +00:00
Stefan Csomor
16a7d8a5a5 adding more specific info for docset
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-11 15:41:44 +00:00
Stefan Csomor
303d821608 adding implementation for osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-10 03:12:58 +00:00
Stefan Csomor
57d3e26697 adding implementation for osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 23:05:52 +00:00
Stefan Csomor
3399af21d1 adding default interpolation enum
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 23:05:09 +00:00
Stefan Csomor
a173c81340 fixing test, adding minimal docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 21:44:19 +00:00
Stefan Csomor
133cb28b21 adding placeholders for interpolation setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 21:38:08 +00:00
Stefan Csomor
b58dca4c0f fixing two warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 01:25:27 +00:00
Stefan Csomor
e5062a3130 fixing memory leak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 01:24:21 +00:00
Stefan Csomor
9d320a7a84 inner layout support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 01:09:33 +00:00
Stefan Csomor
adf264f222 adapting ownership semantics to cocoa convention
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 01:08:43 +00:00
Stefan Csomor
415dfa555a init pattern
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 01:07:39 +00:00
Stefan Csomor
6a62b2c6ed better ownership handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 00:32:27 +00:00
Stefan Csomor
974c115dff guard against nullptr
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 00:31:05 +00:00
Stefan Csomor
395345de7d using common colorspace method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 00:30:26 +00:00
Stefan Csomor
4d3e2dc993 add member for sheetdialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 00:29:13 +00:00
Stefan Csomor
681bf55c1c add member for sheetdialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 00:28:28 +00:00
Stefan Csomor
c2a22141f8 better retain/release semantics
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-09 00:24:21 +00:00
Stefan Csomor
668e3f703e adapting to init pattern
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-08 23:05:54 +00:00
Stefan Csomor
4892e67d72 adding fallback
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-08 23:05:23 +00:00
Stefan Csomor
361937c786 newstate already set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-08 23:02:25 +00:00
Stefan Csomor
dcc5dc59e2 adding fallback
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-08 23:01:53 +00:00
Stefan Csomor
c9e98a88db making intention clearer by explicit parentheses
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-08 23:00:36 +00:00
Stefan Csomor
3dc3b2ab56 fixing uninit vars warning and memory errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-08 22:58:57 +00:00
Stefan Csomor
a985b2c891 adapting to init pattern
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-08 22:50:28 +00:00
Stefan Csomor
f599a41509 adapting to init pattern
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-08 22:48:29 +00:00
Vadim Zeitlin
bbfd454841 Add wxDataViewCtrl::SetRowHeight() and provide its generic implementation.
Allow changing the (fixed) row height without using wxDV_VARIABLE_LINE_HEIGHT
which may slow down the control display too much.

The new method is not implemented for the native GTK and OS X implementations
yet but should be simple to implement there.

See #12749.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 22:49:56 +00:00
Vadim Zeitlin
208f99c3e3 Update status bar fields widths from WM_SIZE handler.
Doing it immediately after calling ::SetWindowPos(), as we used to do, didn't
work correctly (presumably because the status bar fields widths were not
updated yet internally) and resulted in not updating the ellipsized fields
values when "Show window contents while dragging" Windows option was off.
Doing it when we get WM_SIZE works in this case too.

Closes #13257.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 22:49:51 +00:00
Vadim Zeitlin
007d2de3c4 Handle colours with alpha channel correctly in wxSVGFileDC.
wxColour::GetAsString(wxC2S_HTML_SYNTAX) doesn't accept colours with alpha
channel as alpha is not representable in HTML syntax, so avoid calling this
function with such colours, remove the alpha component in the caller before
using it instead.

Also slightly simplify wxBrushString() and wxPenString() functions code in
wxSVGFileDC implementation.

Closes #13214.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 22:27:35 +00:00
Vadim Zeitlin
48dd005569 Replace more DECLARE_CLASS occurrences with DECLARE_DYNAMIC_CLASS.
Correct more mismatches between DECLARE_CLASS and IMPLEMENT_DYNAMIC_CLASS
usage.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 16:48:36 +00:00
Paul Cornett
9579070b94 avoid direct struct access for GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 16:24:26 +00:00
Vadim Zeitlin
80e2b03182 Use DECLARE_DYNAMIC_CLASS instead of DECLARE_CLASS.
Correctly use DECLARE_DYNAMIC_CLASS for the classes that are supposed to be
dynamically creatable as using DECLARE_CLASS doesn't work any longer after the
last commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 14:28:55 +00:00
Vadim Zeitlin
ffc13495b2 Make wxDECLARE_CLASS synonym of wxDECLARE_ABSTRACT_CLASS.
Previously wxDECLARE_CLASS was a synonym for wxDECLARE_DYNAMIC_CLASS which was
inconsistent with its documentation and wxIMPLEMENT_CLASS that was the same as
wxIMPLEMENT_ABSTRACT_CLASS.

Resolve this in the most backwards compatible and also arguably logical way.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 13:06:17 +00:00
Vadim Zeitlin
73423e290f Vietnamese translation update from Trần Ngọc Quân.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 13:06:14 +00:00
Stefan Csomor
ab332136e4 using higher abstraction to allow for optimized implementations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-06 23:23:35 +00:00
Stefan Csomor
2bc4cc1ead speeding up rectangle drawing by using specific methods, needs 40% less time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-06 23:15:27 +00:00
Stefan Csomor
a3c222122d 10.4 compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-06 21:13:33 +00:00
Stefan Csomor
592a3c6eb9 reverting to idle handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-06 21:12:14 +00:00
Stefan Csomor
7e3d8eabcf turning off unconditional usage of filter-delegate, using native capabilities under 10.6, proper handling of empty default directories for dialogs by passing in nil to native calls,
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-06 19:19:42 +00:00
Stefan Csomor
0aff141c51 supporting nested window disablers on the same window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-06 16:32:41 +00:00
Stefan Csomor
d4a4ef9074 supporting native background color on wxWindow descendants that are not themselves native controls, like eg wxPanel , see #13032
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-06 02:28:56 +00:00
Stefan Csomor
776036d671 supporting native background on nonownedwindow, see #13032
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-05 16:08:12 +00:00
Stefan Csomor
203ec4242b adding another assert for tracking modalSession problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-05 15:32:50 +00:00
Julian Smart
45791d3c21 Removed erroneous second reference to status bar height
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-03 17:18:35 +00:00
Stefan Csomor
d1fc95780b allowing more system keys in fullscreen mode, properly taking framestyle into account
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-03 09:15:15 +00:00
Stefan Csomor
65e3da1909 first implementation for state on custom renderer, see #12890
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-02 09:25:11 +00:00
Stefan Csomor
cc71017142 fixes #12867
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-02 08:36:57 +00:00
Stefan Csomor
8a07956565 reactivate commented out method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-02 08:19:16 +00:00
Stefan Csomor
94156c296f cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-02 08:18:11 +00:00
Vadim Zeitlin
7cc84a7322 No changes, just avoid unused parameters warnings.
Wrap parameters of the stub implementation of the newly added StartEditor() in
WXUNUSED().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-01 22:58:05 +00:00
Stefan Csomor
07edda049f first stab at supporting custom renderers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-01 20:05:03 +00:00
Robin Dunn
eeea3b039e Virtualize StartEditor and add implementations for the ports that can do it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-31 19:36:47 +00:00
Robin Dunn
9f2b6b31b7 Build fixes for using Cairo on MSW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-31 19:16:55 +00:00
Paul Cornett
769c3372a2 fix memory leak in wxScreenDC, fixes #13249
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-31 17:16:53 +00:00
Stefan Csomor
40a35c1f87 making sure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-31 08:09:18 +00:00
Vadim Zeitlin
1ee1662007 Free calloc()'d pointer correctly in wxFSWatchEntryMSW.
OVERLAPPED struct was allocated using calloc() but deleted later. Fix this by
deallocating it with free() instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-28 19:35:13 +00:00
Steve Lamerton
ec4ac0f758 Overhaul the wxWebView sample. Bring the style into line with the other samples and improve naming and consistency. Also use a wxInfoBar rather than a custom notification system.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-27 19:47:57 +00:00
Dimitri Schoolwerth
ff5bf31cb1 Fixed saving GIFs on big-endian architectures.
Word (16 bits) values were written in the wrong order resulting in invalid GIF files on for example PowerPC machines.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-27 12:25:25 +00:00
Vadim Zeitlin
2f5dec2e52 Use #ifdef, not #if, to check for __WXGTK26__ symbol.
This fixes gcc warning given if __WXGTK26__ is not defined (which almost never
happens nowadays but still).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-27 09:46:27 +00:00
Steve Lamerton
4e257ee735 Load the wxWidgets homepage by default in the wxWebView sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-26 19:53:03 +00:00
Steve Lamerton
46325534ef Do not show the wxWebView sample tools menu unless a page has been loaded. Originally it crashed but it doesn't make sense to change the zoom or view the source if there is no page loaded.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-26 19:36:20 +00:00
Steve Lamerton
0773a33ca0 Remove various bit of redundant code from the wxWebView sample source view dialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-26 19:17:01 +00:00
Steve Lamerton
853b6cd0e4 Add a new event type for new window creation, document and implement under MSW. Update the sample to veto new window events, this means under Window we no long get Internet Explorer windows appearing for some links.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-26 18:43:18 +00:00
Stefan Csomor
2077a6ad23 using systemui for full screen to allow modal dialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-25 11:26:47 +00:00
Vadim Zeitlin
6dfd1add4a Correct the picker button best size computation.
Fix the typo in the changes of r67763.

See #13232.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-24 21:19:35 +00:00
Stefan Csomor
0f27b6637a guard against NULL textctrl, fixes #13247
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-24 17:38:03 +00:00
Vadim Zeitlin
01456a3fa3 Correct type MSVCProjectBuilder in the build script.
This prevented MSVC version detection from environment variables from working.

Closes #13243.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-23 23:20:18 +00:00
Vadim Zeitlin
218697e27b Don't use native MSW wxHyperlinkCtrl implementation in wxUniv.
Move src/msw/hyperlink.cpp and include/wx/msw/hyperlink.h to
ADVANCED_MSW_NATIVE_SRC/HDR from ADVANCED_MSW_SRC/HDR respectively to ensure
that these files are not used in wxUniv build that uses its own, generic,
versions.

This should fix wxUniv/MSW build as the native files didn't even compile with
wxUniv.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-23 15:26:42 +00:00
Vadim Zeitlin
2e103d05f1 Rebake after the addition of more richtext headers.
The project files haven't been updated after the last files.bkl modification,
do it now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-23 15:26:38 +00:00
Vadim Zeitlin
bf0f3b269f Add a trivial benchmark for wxDateTime::ParseDate().
Add a test to check the performance of this method.

See #13242.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-23 11:06:48 +00:00
Vadim Zeitlin
979fa8c2ad Italian translations update from Stefano <l.stickell@@yahoo.it>.
Minor updates to the translations themselves.

Also changed the charset to UTF-8 from Latin-1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-22 10:53:10 +00:00
Dimitri Schoolwerth
dc8c61bef7 Fixed wxMessageBox with only an OK button returning wxCANCEL under MSW.
Since r67620 when wxMessageDialog::ShowModal uses a native task dialog and only has an OK button it actually uses a Cancel button, this resulted in the function's return value wrongly changing to wxID_CANCEL. Fix this by handling the special case with only an OK button and return wxID_OK instead of wxID_CANCEL (and thus wxMessageBox, which uses wxMessageDialog::ShowModal, returning wxOK instead of wxCANCEL).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-20 22:48:17 +00:00
Dimitri Schoolwerth
1667f96a85 Applied patch containing small corrections to German translations.
Patch by Blake Oleander (snowleopard2) with input from Robert Hoffmann. Closes #13212.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-20 22:44:53 +00:00
Vadim Zeitlin
9ed406c39d Avoid conversion from wxString to wxChar* and back in wxListBase::DoCopy().
Don't use temporary wxChar* variable to store the node string. This is not
only inefficient because we need to convert wxString to it only to convert it
back to wxString on the next line but also breaks compilation when
wxUSE_STD_STRING==1 and wxUSE_STD_CONTAINERS==0 as there is no implicit
conversion between wxString and wxChar* in this case.

Also modify the code for long keys in the same way just for consistency.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-20 14:29:07 +00:00
Jaakko Salli
1d8340b956 Allow wxPGProperty::IsChildSelected() to work recursively
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-20 14:26:17 +00:00
Steve Lamerton
a427ca2713 Don't pass raw urls to logging functions in the wxWebView sample as they can contain percent characters which then cause format string errors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-19 20:43:45 +00:00
Steve Lamerton
be19c55608 Block new frames being created in wxWebViewIE, bringing it into line with the other ports. The existing code was mostly correct but a missing break in the switch caused many spurious events.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-19 20:14:27 +00:00
Steve Lamerton
70554c327e Remove defined values from wxWebView enums. We probably don't want people relying on these as they may well end up changing and there is no benefit to fixing them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-19 19:42:01 +00:00
Steve Lamerton
dec53e5a56 Move wxWebView documentation into a separate interface file and add the wxWeb library to the libraries page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-19 18:28:01 +00:00
Vadim Zeitlin
df5f11feee Make picker control at least as high as the associated text and square.
Ensure that the height of the picker control is at least as big as the height
of the associated text control and that it's at least as wide as it is high as
it looks bad otherwise.

Closes #13232.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-19 14:14:58 +00:00
Steve Lamerton
7aa18fc786 Update wxWebViewIE::Reload so that reloading without using the cache works and doesn't crash.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-18 16:35:35 +00:00
Stefan Csomor
73be128174 making sure clip (device coordinages) is applied before any transforms, fixes #13216
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-18 07:32:58 +00:00
Vadim Zeitlin
715efa4e25 Allow passing wxLongLong values directly to wx pseudo-vararg functions.
Allow passing wxLongLong objects when a "%lld" format specifier (or
equivalent) is used just as we already do for wxString objects when "%s" is
used. This is more convenient and makes wxLongLong closes to the native type.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-17 22:12:39 +00:00
Vadim Zeitlin
8ea26eedce Don't construct invalid wxDateTime in GTK calendar control callbacks.
GTK+ may momentarily return invalid date when switching the month in the
calendar control. Check for this and adjust the date ourselves to make it
valid if necessary in order to avoid the asserts from wxDateTime ctor.

Closes #13224.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-17 22:12:35 +00:00
Vadim Zeitlin
473d0f930e Fix client to screen translation in wxWindowMSW::PopupMenu().
Use wxWidgets ClientToScreen() function for computing the screen coordinates
of the popup menu instead of Windows ::ClientToScreen() as the latter doesn't
know about the toolbar which may be present in wxFrame and excluded from the
client area.

Closes #13223.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-17 13:35:04 +00:00
Steve Lamerton
8290e3cd91 Rename source files for consistency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-16 20:49:54 +00:00
Vadim Zeitlin
352a7d6c46 Ensure that we never return negative client size.
wxMSW could return negative client size for tiny windows with borders, this
was unexpected and shouldn't happen so explicitly ensure it does not.

Also add a unit test to check that this problem doesn't exist in other ports.

Closes #13184.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-16 14:07:40 +00:00
Vadim Zeitlin
5f081e28fa No changes, just refactor the code in MSW wxGetOsDescription() slightly.
Construct the description string from several pieces: the OS name, its build
number and any extra information about it, instead of duplicating the code
appending the build number to the name in several places.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-16 10:01:12 +00:00
Vadim Zeitlin
7c7eed5656 Recognize Windows 7 and Server 2008 versions in wxGetOsDescription().
Use marketing names for these systems instead of just describing them as
"Window NT x.y".

Closes #13220.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-16 10:01:08 +00:00
Vadim Zeitlin
a699420104 Allow dragging floating AUI frames by the gripper.
Previously starting to drag a pane by its gripper worked but once it undocked
it was impossible to drag it by the gripper any more which was annoying for
the user and unexpected.

Fix this by ensuring that we move the correct top level window and not the
child window when dragging floating panes.

Closes #13177.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-15 16:16:11 +00:00
Vadim Zeitlin
efd516c29b Fix small error in floating AUI frames client size under wxMSW.
The client size of the floating frames ended up being wrong because we changed
the wxRESIZE_BORDER flag after setting it and this changed it (at least under
MSW).

Reset wxRESIZE_BORDER first now and set the client size correctly afterwards.

Closes #13043.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-14 14:18:20 +00:00
Vadim Zeitlin
55908cf096 Fix restoring of wxAuiManager::m_has_maximized when restoring perspective.
If the perspective being loaded contains a maximized pane, set the
m_has_maximized flag to true. Otherwise the flag and the effective pane state
was out of sync resulting in several problems in the UI behaviour.

Closes #12527.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-14 14:18:17 +00:00
Vadim Zeitlin
026c6eff70 Correct the drawing of check tools with a drop down button in wxAuiToolBar.
This combination was simply not covered by the existing code, add the missing
DrawDropDownButton() call.

Closes #11139.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-14 14:18:14 +00:00
Vadim Zeitlin
587151f730 Reset the checked state of the first radio item in wxAuiToolBar too.
Fix the condition of the loop in wxAuiToolBar::ToggleTool() to also uncheck
the item with index 0 that was always excluded before because of "i > 0" check
in the loop.

Also exclude the item being turned on itself from the loops, it's useless to
reset its checked state only to turn it on again below.

Closes #11110.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-14 14:18:09 +00:00
Vadim Zeitlin
a4e5e0b90c Check for NULL pane window in wxAuiManager.
Check that the AUI pane has a non-NULL associated frame before checking
whether it's shown.

This should fix a crash which could happen when docking an undocked toolbar.

Closes #10926.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-14 14:18:05 +00:00
Vadim Zeitlin
fdc5bc9f67 Improve checking for the landing point when docking windows in wxAUI.
This is especially important for multiple monitor setups in which the old code
could result in false positives and suggest docking a window on a wrong
display.

Closes #10612.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-14 14:18:02 +00:00
Vadim Zeitlin
2347971e99 Draw wxAuiToolbar button text even if it has no bitmap.
Don't skip drawing the button label if it doesn't have any bitmap.

Closes #10303.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-14 14:17:59 +00:00
Vadim Zeitlin
cb542c4046 Take the AUI floating title bar height into account when dragging it.
The cursor wasn't positioned correctly when a floating toolbar was dragged by
pressing the mouse over its gripper because its position didn't take into
account the difference between the client and window coordinates of the
floating window (which is basically the height of the window title bar).

Notice that the same problem still remains when starting to drag a docked
toolbar as it doesn't have the title bar initially but does have it later
so the same fix should probably be applied when we reparent the toolbar.

Closes #9984.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-14 14:17:55 +00:00
Vadim Zeitlin
2bd82d72f5 Cancel dragging in wxAuiNotebook on capture loss.
Don't leave the display and internal variables in inconsistent state when the
mouse capture is lost while a notebook page is being dragged (as can happen
if Alt-Tab is pressed under Windows, for example).

Closes #9976.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-14 14:17:52 +00:00
Vadim Zeitlin
7311debd0d Don't use the standard containers by default.
Revert the change of wxUSE_STD_CONTAINERS to 1 by default as this introduces
more incompatibilities which risk hamper upgrading to 3.0 unnecessarily.

Update the documentation to better explain why do the non-standard container
classes exist in wxWidgets and, especially, that they shouldn't be used when
possible. Also document the differences between the normal and STL containers
build in the manual.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-13 13:30:12 +00:00
Vadim Zeitlin
c4264a8317 Fix the comparison function in the list control sample to do what it says.
The comment in the function implied that it exchanged the items but in fact it
did not and kept their existing order instead.

Do revert them now, at least like this something visibly happens in the sample
when the items are sorted.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-13 13:30:07 +00:00
Vadim Zeitlin
d3ca848751 Make wxListCtrl sort function take wxIntPtr, not long, arguments.
As the arguments to the sort function contain the client data associated with
the items, they may be pointers and hence of greater size than long in Win64
builds. Use wxIntPtr instead of long everywhere to fix this.

Notice that this doesn't break compatibility for 32 bit code where long can
still be used as it is the same as wxIntPtr there after the previous commit.

Closes #4309.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-13 13:30:03 +00:00
Vadim Zeitlin
76b513074d Define wx[U]IntPtr as long, not [s]size_t, in 32 bit builds.
Defining wxIntPtr as ssize_t or long in 32 bit builds doesn't really change
anything but using long means that we can replace longs in the existing API
with wxIntPtr without breaking compatibility, like in wxListCtrl::SortItems().
It is also more compatible with 64 bit builds where wxIntPtr is long already.
So it has some minor advantages and no apparent drawbacks.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-13 13:29:59 +00:00
Vadim Zeitlin
aacbb5dc43 Remove duplicated portability warning from wxShowEvent description.
The warning about this event not being generated by all ports was already
present, remove the second copy.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-13 13:29:55 +00:00
Dimitri Schoolwerth
f32204b0c4 Fixed wxUSE_STD_DEFAULT==0 compilation.
ScintillaWX.cpp didn't compile because std::string is unknown. Include <string> in case the defines that (by default) are set to wxUSE_STD_DEFAULT are 0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-13 11:24:28 +00:00
Julian Smart
71185527a0 wxRTC doc updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-11 16:45:34 +00:00
Julian Smart
3395d7b48e Use more appropriate border style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-11 16:44:19 +00:00
Vadim Zeitlin
293a6aaf0a Don't document wxFileSystemWatcher::AddTree() as pure virtual.
It isn't.

See #12847.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-11 15:52:04 +00:00
Stefan Csomor
3cac36541b separating observers for default mode (outer 'normal' loop) and common mode loops, fixes #13208
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-11 06:46:07 +00:00
Václav Slavík
76ba33d39a Clarify that wxFileName::GetPath() appends separator for toplevel dirs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-10 09:58:52 +00:00
Vadim Zeitlin
d3eec3b672 Attempt to work around Mac g++ 4.0 bug in fswatcher unit test.
Don't define the class overriding a virtual base class method inside the test
function as g++ 4.0 under OS X 10.5 fails to compile this for some mysterious
reason.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-10 08:54:20 +00:00
Vadim Zeitlin
a082862987 Fix inserting radio menu items in wxGTK too.
After fixing the insertion of radio menu items in wxMSW, also do it for wxGTK
to make the newly added unit test pass there as well.

Remove the unneeded wxMenu::m_prevRadio which doesn't make any sense neither
(just as the "current radio group" pointer removed from wxMSW code before) and
simply use the radio group of the existing item this radio item is being
inserted before or after instead.

See #13200.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-10 08:50:47 +00:00
Vadim Zeitlin
89511b4268 Rewrote wxMSW radio menu items code to support not only appending them.
Previously the radio menu items could only be appended to a menu in wxMSW,
inserting them (either in an existing radio group or to start a new one) not
only didn't work but could even result in crashes because invalid iterators in
the menu items list could be used.

Fix this by storing the ranges of all radio groups in wxMenu itself instead of
storing the information about the radio group an item belongs to in the item
itself and by updating this data whenever a new radio item is inserted. Also
get rid of the notion of "current radio group" in wxMenu which doesn't really
make any sense.

Finally add a unit test checking that inserting radio items works as expected.

Closes #13200.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-10 08:50:38 +00:00
Jaakko Salli
a6ca624a27 Fixed a bug: Disabling a property didn't work properly if a child item was selected.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-09 19:44:40 +00:00
Julian Smart
d476d8541a Added further wxRTC files to files.bkl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-09 10:08:27 +00:00
Vadim Zeitlin
1bdeb24eea Document wxBitmapToggleButton XRC parameters.
Describe the properties specific to this class in the XRC format
documentation.

Closes #13204.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-09 09:21:25 +00:00
Vadim Zeitlin
8c7f440c2e Add wx/richtext/richtextuicustomization.h to the headers list.
This header wasn't installed before, add it to RICHTEXT_HDR files list in
files.bkl to fix this.

Closes #13203.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-09 09:21:20 +00:00
Vadim Zeitlin
b3c6dd3b53 No changes, just sort richtext files in files.bkl.
Sort RICHTEXT_{SRC,HDR} contents in alphabetical order, just as it's done for
all the other files list and to make it easier to check if a file already
occurs in these lists or not.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-09 09:21:14 +00:00
Julian Smart
7afd2b58c5 More work on improving wxRTC documentation, copied buffer and control headers to interface folder.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-08 18:29:51 +00:00
Steve Lamerton
97ad1425fe Enable IE backend in msw builds unconditionally until the backend flags work properly. Conditionally define INET constants only under mingw as it does not apparently provide them. Fix some typos. The sample now compiles under msw.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-06 15:28:19 +00:00
Steve Lamerton
a703012aed Use correct reload flags on all platforms to avoid compilation errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-06 13:37:01 +00:00
Steve Lamerton
2724d84bbe Move msw configuration checking to chkconf.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-06 12:59:13 +00:00
Steve Lamerton
3046dbdcfe Add the correct dll export macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-06 11:00:45 +00:00
Dimitri Schoolwerth
5c98cb9b75 Fixed failing to load ANI, BMP, and ICO images from non-seekable streams.
Guarded recently added SeekI() calls by calling is IsSeekable() first.

Regression since r67671.

Closes #12861 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-05 23:52:07 +00:00
Steve Lamerton
5771c1aa77 Minor fixes to allow web sample to compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-05 20:51:49 +00:00
Steve Lamerton
9c805dec6c Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow minimal builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-05 20:30:51 +00:00
Steve Lamerton
3544f421d8 A few more build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-05 18:48:07 +00:00
Robin Dunn
066bd25191 When we're using GDI+, the DC might have transforms applied to it, but the renderer APIs don't respect them. So we need to apply the transforms to the rect ourselves.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-05 17:56:18 +00:00
Steve Lamerton
384b8d9f3d Various typos fixes and minor build system changes. After a rebake wxMSW should now compile, although without any functionality.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-05 13:01:54 +00:00
Steve Lamerton
66d06c04e3 Tidy the files list, move the wxWEB files to their own section. Include the headers in the all headers section.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 19:03:53 +00:00
Steve Lamerton
61b98a2dac Set the correct svn properties on the new files. Correct a minor date typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 18:24:30 +00:00
Steve Lamerton
cfcf1d6ee3 Application of the most recent wxWebView patch, the only changes were so tab to space conversions. Please note this probably won't compile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 15:40:00 +00:00
Robin Dunn
44cba02ea7 Adda virtual dtor to silence warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 00:41:16 +00:00
Robin Dunn
5be8929895 Wipe the old framework (if any) when building a new one. Fix symlinks. Add a plist.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 00:40:36 +00:00
Vadim Zeitlin
6a9455d3f0 Fix compilation of wxFileSystemWatcher unit test in non-PCH build.
Add #include of wx/timer.h needed when not using PCH.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-04 00:01:58 +00:00
Vadim Zeitlin
2b6259fe1c Fix wxFileSystemWatcher usage instructions.
Don't mention the virtual OnXXX() functions which were removed from the final
API.

Also mention AddTree() limitations on non-MSW platforms.

See #12847.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 23:31:43 +00:00
Vadim Zeitlin
f8d3714816 Implement watching directory correctly in MSW wxFileSystemWatcher.
The directories used to be always monitored recursively, even when this wasn't
requested, in wxMSW implementation. Change this but also implement efficient
support for monitoring the entire hierarchies using the native support for
this.

Also update the sample to allow monitoring directories recursively as well.

See #12847.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 23:31:39 +00:00
Vadim Zeitlin
4610ad4ecb Don't watch directories recursively in wxMSW wxFileSystemWatcher.
MSW implementation of this class always watched the added entries recursively,
i.e. always behaved as if the entry to watch was added using AddTree().

Fix this simply by not asking ::ReadDirectoryChangesW() to watch the entire
subtree.

See #12847.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 23:31:35 +00:00
Vadim Zeitlin
51fb867819 Fix wxFileSystemWatcher::Remove() in wxMSW.
Removing the path watched by wxFileSystemWatcher didn't do anything in wxMSW
implementation so we still continued getting events for the changes to this
path even after calling Remove().

Fix this by really implementing Remove() properly. Also add a unit test
checking that we don't get any events after calling Remove().

See #12847.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 23:31:29 +00:00
Vadim Zeitlin
17e23c0cb9 No changes, just slightly simplify wxFileSystemWatcher unit test.
CheckResult() method of the test event handler doesn't need to return
anything, it uses CPPUNIT_ASSERTs and related macros inside it to check that
everything is expected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 23:31:24 +00:00
Vadim Zeitlin
ad94cb2b4f Fix assert when creating wxBitmapButton without a valid bitmap in wxMSW.
wxBitmapButton can be created without a valid bitmap if SetBitmapLabel() is
called later, so don't call SetBitmapLabel() from the constructor if no bitmap
was provided.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 23:31:15 +00:00
Stefan Csomor
a6df08eca3 project files for xcode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 19:05:24 +00:00
Stefan Csomor
71447e56a7 removing old xcode files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 18:28:49 +00:00
Stefan Csomor
efa4bab2d1 removing old codewarrior files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 18:24:15 +00:00
Stefan Csomor
be25b02332 removing old codewarrior files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 18:22:31 +00:00
Stefan Csomor
1b15cf5cd0 removing old xcode files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 18:21:25 +00:00
Stefan Csomor
01c3da8d07 removing old xcode files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 18:21:15 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Dimitri Schoolwerth
ddd7e4307b Restored wxNotebook::HitTest for wxOSX-Carbon.
Since the copying of src/osx/carbon/notebmac.cpp to src/osx/notebook_osx.cpp in r55202 the code in wxNotebook::HitTest has been disabled. Enabled it again for at least the Carbon build.

See #13045.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 12:47:10 +00:00
Vadim Zeitlin
f18b415ee3 Don't crash on startup of console programs in monolithic wxX11 build.
When using monolithic build, GUI-specific wxWinModule is still linked in but
its initialization crashes because there is no global display. Simply don't do
anything in this module OnInit() in this case to avoid the problem (which
affected e.g. wxrc in this build configuration).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 10:40:31 +00:00
Vadim Zeitlin
d66ddd70c7 Correct wxDirExists() check in OS X wxFileSystemWatcher implementation.
Pass the full path to wxDirExists, not the relative path from the watched
directory as this won't work unless the watched directory is the same as the
current one.

Closes #13161.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 10:40:28 +00:00
Vadim Zeitlin
61490d3b60 Add wxDocManager::GetPageSetupDialogData() accessor.
Allow accessing the print data stored in wxDocManager from outside the class.

Closes #13190.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 10:40:23 +00:00
Vadim Zeitlin
ad7922b8aa Increase the number of index items shown by default in wxHTML.
Consider that small index is up to 1000 items, not up to 100 which is really
too small.

See #10573.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 10:40:17 +00:00
Jouk Jansen
0c993c6fdb add src/common/affinematrix2d.cpp to OpenVMS makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-02 07:25:26 +00:00
Dimitri Schoolwerth
bf34105a41 Fixed reading multiple images from ANI and ICO image files.
In r60852 various 'unneeded' SeekI(0) calls were removed. Examined the changes in that revision and restored all SeekI(0) calls after finding out their removal caused problems with reading more than one image from ICO and ANI files. The image handling code for these formats expects to read from the start of a stream for reading its images (as well as for DoCanRead and DoGetImageCount), regardless of the index of the requested image.

Closes #12861.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-01 23:35:46 +00:00
Stefan Csomor
a6afde630c support multiline strings using the same workaround as msw, fixes #13019
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-01 19:07:16 +00:00
Václav Slavík
c81394808b Make wxSpinCtrlGeneric usable as wxDVC editor control.
wxDVC installs temporary event handler that watches for focus changes
and some key events. Make wxSpinCtrlGeneric look like a native
wxControl in this respect even though it's actually a composite control.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-01 18:44:35 +00:00
Vadim Zeitlin
1a9dfe8dcb Create branch for wxWebView GSoC 2011 project.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-01 16:05:52 +00:00
Vadim Zeitlin
8a95db3429 Translate various user-visible strings in rich text print code.
Make default wxRichTextPrintout title and the name of wxRichTextPrinting
object translatable.

Closes #13187.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-01 15:58:36 +00:00
Vadim Zeitlin
fe576f48fb Verify the validity of the buffer size in wxBufferedDC.
Passing invalid (e.g. negative) buffer size to wxBufferedDC resulted in many
problems later on so refuse it immediately.

Closes #13175.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-01 15:47:46 +00:00
Vadim Zeitlin
8e370f7d07 Add a section about STL containers-related incompatible changes.
Document the main incompatibilities between the STL and non-STL containers
builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-01 15:47:44 +00:00
Dimitri Schoolwerth
1b54c33f81 Rebaked test GUI projects with toplevel.cpp included.
Added toplevel.cpp to GUI test projects and removed the test suite from the unnamed registry so that by default its tests don't run (some regarding ShowWithoutActivating are failing). This way at least the source file has more of a chance to be in a compilable state (compilation was broken). toplevel.cpp has never been included in a project since its addition in r62508 ("[...] until the mainloop issues are resolved [...]").

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-01 14:58:58 +00:00
Dimitri Schoolwerth
e3778b4d9c No code changes, fixed some typos.
Changed several occurrences of "it's" where "its" is meant, as well as a few other minor typos.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-30 10:57:04 +00:00
Robin Dunn
b4f28d1ef6 Fix popen2 deprecation warning.
Fix binary name inside the framework to be the same as the framework name.
Inject a bit of info about the framework into wx-config, so it can output framework flags/names instead of lib flags/names.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-29 20:03:45 +00:00
Vadim Zeitlin
783d8c1131 Remove fixed size of gs_encodingNames array in font mapper code.
Specifying the size explicitly made wxCOMPILE_TIME_ASSERT() checking that the
array sizes were synchronized useless as the array always had the correct
size, independently of the real number of elements in it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-28 16:57:21 +00:00
Vadim Zeitlin
12b5857d04 Correct wxFontMapper tables for Big-5, Shift-JIS and GB2312 encodings.
As wxFONTENCODING_{BIG5,SHIFT_JIS,GB2312} are only synonyms for the other
encoding constants, we must append the corresponding names to the array of
names for the real encoding value instead of having the (never used) separate
entries for them in the names array.

Closes #13164.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-28 16:57:15 +00:00
Vadim Zeitlin
4c24ca50d6 Fix wxULongLongNative::ToDouble() compilation with VC6.
The problem alluded to by the commit message of r40658 arose only in the DLL
build using VC6 so reintroduce the workaround for it removed by r67634 but
make it VC6-specific and, arguably even more importantly, also make it work
correctly for wxULongLongNative values greater than LONGLONG_MAX.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-28 16:16:16 +00:00
Vadim Zeitlin
a8db6ab73e Use correct GTK macro in wx_gtk_widget_get_sensitive().
Using GTK_WIDGET_VISIBLE() to test for sensitivity was not going to work (and,
in fact, it didn't and broke the unit tests).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-28 14:29:56 +00:00
Vadim Zeitlin
ebbbd51bbc Fix check in assert in wxULongLong::ToULong().
We can convert values up to ULONG_MAX to unsigned long losslessly, not up to
LONG_MAX.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-28 14:20:32 +00:00
Vadim Zeitlin
c92e136d9a Don't specialize std::numeric_limits<> for wxLongLong when using VC6.
This doesn't work with VC6 anyhow as it doesn't provide numeric_limits<>
specialization for __int64 and results in many warnings C4663 as the standard
header itself uses obsolete template specialization syntax.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-28 14:20:29 +00:00
Robin Dunn
e2db04f8df Change --j to --jobs, add --mac_framework_prefix, add some helper functions to be used from build-wxpython.py and fix a bunch of other little stuff.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-28 06:08:47 +00:00
Vadim Zeitlin
77b239d4ba Fix wxULongLong::ToDouble() for MSVC.
The conversion of wxULongLong to double was broken for MSVC by r40658 which
was supposed to correct some unspecified compilation problem but this code
seems to compile fine with at least recent versions of MSVC and, in any case,
correcting compilation only for the code to work incorrectly during run-time
doesn't look like a good idea.

This fixes current unit test failures in wxMSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-27 18:51:00 +00:00
Vadim Zeitlin
dff485d079 Disable numeric_limits<wxLongLong> test for VC6.
VC6 doesn't specialize numeric_limits<> for its __int64 so it's not
specialized for wxLongLong neither when using this compiler.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-27 18:44:11 +00:00
Vadim Zeitlin
48611b8fc2 Get rid of useless temporaries in wxAffineMatrix2D unit test.
See #13092.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-27 18:44:07 +00:00
Vadim Zeitlin
09fa09bf2b Add wxUSE_DC_TRANSFORM_MATRIX checks to the unit test.
Allow the unit test to compile even when wxUSE_DC_TRANSFORM_MATRIX is 0.

See #13092.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-27 18:43:58 +00:00
Jouk Jansen
de6db7c103 Add wxUSE_DC_TRANSFORM_MATRIX to setup for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-27 10:26:08 +00:00
Vadim Zeitlin
dfc2e4961e Change VIEWPORT_EXTENT constant in wxMSW wxDC code to be a power of two.
Notice that this commit doesn't really change anything, in particular it
doesn't correct zooming for zoom factors that are power of 2 (which was broken
before as ticket #11669 showed), this was already done by the previous commit.
This one simply makes multiplying by VIEWPORT_EXTENT a tiny bit more efficient.

See #9554.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:45 +00:00
Vadim Zeitlin
a152f137f6 Avoid rounding errors in wxMSW wxDC scaling code.
Multiply by scale factor when it's > 1 and divide by it when it's < 1 to avoid
rounding errors. By choosing whether to increase the viewport or window
extents we increase precisions without any apparent negative effects (at least
under Windows NT where the coordinates in 2^27 range are supported, but even
under Windows 9x it's not clear if the old code was better as while we never
overflowed the viewport extents, we could overflow the window ones easily for
small zoom factors).

Closes #9554.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:42 +00:00
Vadim Zeitlin
42604e44be Remove apparently erroneous -1 from DrawBitmap() in wxMSW wxGC code.
We didn't draw the last line and row of the image for some reason, simply
remove the -1 which prevented us from doing this.

Closes #12476.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:39 +00:00
Vadim Zeitlin
85a9228394 Make wxSMALL_FONT larger under MSW as it was unreadable otherwise.
The default size of the normal font is 9pt under MSW and 7pt is too small for
wxSMALL_FONT, use 8pt for it instead.

Closes #13104.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:33 +00:00
Vadim Zeitlin
18c8dd2be2 Ensure that message boxes with only "OK" can be closed with Escape in wxMSW.
The native task dialog doesn't allow using Escape (nor Alt-F4 but this is less
annoying) to close it unless it has a Cancel button, so by default the dialogs
with only "OK" couldn't be closed with Escape.

Work around this by creating a Cancel button with "OK" label instead. This is
not ideal but there doesn't seem to be any other way to make this work.

See #12501.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:30 +00:00
Vadim Zeitlin
6aacfc7320 Allow showing the print preview frame non modally.
Still show the print preview app modally by default, i.e. disabling all the
other windows, but also allow disabling only the preview parent or nothing at
all.

Closes #13108.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:27 +00:00
Vadim Zeitlin
c25f8d007d No changes, just replace #defines with enums in printing sample.
This makes it more convenient to define menu ids with consecutive values as
will be done in the next commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:23 +00:00
Vadim Zeitlin
ab797d5d34 Add a unit test for wxAffineMatrix2D class and its support in wxDC.
Verify that applying a world transformation to wxDC really does result in the
expected transformation.

See #13092.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:20 +00:00
Vadim Zeitlin
a25b5bbfc9 Make it easier to compare wxImages in the unit tests.
Instead of forcing the tests to manually use memcmp(), specialize
CppUnit::assertion_traits<> for wxImage. This allows to simply use
CPPUNIT_ASSERT_EQUAL() and related macros with wxImage objects.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:16 +00:00
Vadim Zeitlin
051b7b264f Update line height in generic wxListCtrl to match images height.
The height of the items of the generic wxListCtrl remained too small if an
image of a greater than standard size was used.

Fix this by forcing the line height recalculation when adding an item using an
image higher than the current line height.

Closes #12806.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:12 +00:00
Vadim Zeitlin
de83bbe34f No changes, just simplify the mask checks in wxImage::Paste().
Replace the test of the form "(!a && b) || (a && b)" with a simple test for
"b" and then also replace the test for "b || (c && !b)" with just "b || c".
The end result is much easier to read and understand.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:08 +00:00
Vadim Zeitlin
be0d0fedf9 Optimize alpha handling in wxImage::Rotate90() too.
The changes of r66309 optimized the rotation of the pixel data by doing it in
entire strips instead of pixel by pixel, apply the same technique now to the
rotation of alpha data as well.

Closes #12739.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:05 +00:00
Vadim Zeitlin
b2fd3bea36 Fix assert when destroying wxDataViewCtrl being edited in wxGTK.
If wxDataViewCtrl was destroyed while showing a generic editor, an assert
occurred in wxWindowBase dtor as the event handler pushed on it by the editor.

Fix this by calling CancelEditing() when the control is destroyed and also fix
the crash in CancelEditing() in wxGTK due to recursive calls to FinishEditing().

Closes #12683.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:01 +00:00
Vadim Zeitlin
b3a8aa924a No changes, just get rid of wxDataViewColumn::GetConstGtkHandle().
If both const and non-const accessors are needed, it's custom to use the same
name for both but in this case we don't even need them as the const version
can always be used, so simply remove the weird and badly named (because the
returned handle is not const at all) GetConstGtkHandle().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:56:56 +00:00
Vadim Zeitlin
3dd4d0ec9e Specialize std::numeric_limits<> for wxLongLong and wxULongLong.
numeric_limits<> should be specialized for number-like types to allow using
them in a similar way to the built-in types.

Closes #13162.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:56:50 +00:00
Robin Dunn
e3e89e6260 Don't change CC and CXX for the SDK options until after the compiler version has been chosen so it doesn't mess up the version tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 19:02:14 +00:00
Robin Dunn
6d6f2e7c17 Remove lipo options, that hack is no longer needed since we are not supporting OSX 10.3 any more. Also some work to get framework builds working properly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 17:39:53 +00:00
Robin Dunn
3fbba098a2 Use DESTDIR properly and fix change-install-names script. Closes #12461
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 17:35:35 +00:00
Stefan Csomor
91116a35f2 fixes #12220
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 17:14:50 +00:00
Robin Dunn
c141046071 Fix the size of the tree's text editing box on Cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-25 23:18:19 +00:00
Dimitri Schoolwerth
cbbb1f5489 Fixed filename in wxOSX-Cocoa's file dialog using extension of wrong file type.
When using SetFilterIndex to indicate a different initial file type the dialog would still use the extension of the first file type (if the filename had no extension then unchecking "Hide extension" would append the first file type's extension). Fixed this by calling code, that formerly got called only from OnFilterSelected, to notify OS X of the file type change.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-25 13:18:45 +00:00
Václav Slavík
aef081f465 Don't rely on RVO in wxON_BLOCK_EXIT_SET().
MakeVarSetter() relies on the compiler always using RVO, as
VariableSetterImpl<> doesn't have correct copy ctor; worse yet, its use
wasn't detected at compile time.  With some compilers (e.g. VC++ 2008
with non-trivial variable types), this resulted in the variable being
reset too soon, immediately in the place where the macro was used.
Fixed by using the same technique already used in wxScopeGuardImpl. In
fact, VariableSetterImpl is just another special case of
wxScopeGuardImpl, so just derive from the latter.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-24 13:14:47 +00:00
Vadim Zeitlin
da87ce5a36 Don't generate wxEVT_COMMAND_DATAVIEW_CACHE_HINT for empty control.
Don't send any cache hint events for empty wxDataViewCtrl. Sending them was
unnecessary, inconsistent with wxListCtrl (which doesn't send them when it's
empty) and the events also had incorrect range. Just don't create them at all
to avoid all these problems at once.

Closes #13132.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 18:01:36 +00:00
Vadim Zeitlin
68f64b40bf Don't close arcs drawn in wxPostScriptDC.
Draw arcs, not pies, in DoDrawArc(): simply remove the apparently unnecessary
last lineto and closepath PostScript statements.

Closes #13141.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 17:36:11 +00:00
Vadim Zeitlin
c7e94140cd Change wxNotebook selection before sending page changed event in wxMSW.
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED handler should see the new page selected
in the control, not the old one as was the case if the page was changed using
the mouse in wxMSW.

This should have been done together with the other changes of r66224, see its
commit message for more details.

Closes 13145.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 16:19:15 +00:00
Vadim Zeitlin
e71508e160 Add wxDC::SetTransformMatrix() and related methods and implement them in wxMSW.
Add support for world transformations to wxDC too. Currently this is
implemented in wxMSW only but could be easily provided in the ports that use
wxGraphicsContext for wxDC implementation later.

Closes #13092.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 16:03:10 +00:00
Vadim Zeitlin
54580df4e2 Fix compilation error in recent change to wxSizeEvent generation.
Wrong variable name was used in r67583, fix it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 15:12:59 +00:00
Vadim Zeitlin
15fa4de377 Correct names of parameters in wxAffineMatrix2D documentation.
Some parameters were misnamed in @param paragraphs, fix this.

Closes #13143.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 14:53:42 +00:00
Vadim Zeitlin
2ab92d62cf Add a simple unit test for wxParseCommonDialogsFilter().
Verify that this function (which is used for parsing the wildcard strings used
with file-related dialogs) works as expected and also asserts when given
invalid input.

See #4489.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 14:53:38 +00:00
Vadim Zeitlin
b22a1070b3 Document that wxTreeCtrl::SelectItem() generates events.
This is another exception to the general rule that program actions don't
generate any events so document it explicitly.

See #13153.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 11:17:43 +00:00
Vadim Zeitlin
df97a4ef79 Set event object correctly for the generated wxSizeEvents.
wxSizeEvent event object was not set correctly in at least a couple of places.
Do set it now.

Closes #13156.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 11:17:40 +00:00
Vadim Zeitlin
a6fd3ed883 Remove duplicate negated option indicator in wxCmdLineParser help.
The indicator of a negatable option (one with wxCMD_LINE_SWITCH_NEGATABLE
flag) appeared twice in the usage message, don't add it the second time.

Closes #13157.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 11:17:36 +00:00
Vadim Zeitlin
f3b1d0fc56 Fix file paths in wxFileSystemWatcherEvent under OS X.
The separator between the watched directory and the name of the file in the
generated event was missing, add it now.

Closes #13161.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 11:17:33 +00:00
Vadim Zeitlin
d7cfeeb49c Set page range in the print preview correctly.
The valid pages range was set too early before, we need to postpone it until
after the OnPreparePrinting() call of the user-defined wxPrintout object as
only it can determine the number of pages (after running the pagination
algorithm) in general.

Set the pages range during the first call to RenderPageIntoDC() to fix this.

Also add wxPrintPageMaxCtrl class for symmetry with the existing
wxPrintPageTextCtrl and use a shared constant MAX_PAGE_NUMBER instead of hard
coded 99999. Slightly improve the layout of wxPrintPageMaxCtrl too.

Closes #12965.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 10:49:48 +00:00
Vadim Zeitlin
a78d2fbab1 Make the source files non-executable again.
Revert the (probably accidental) mode change of r67576.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-23 10:41:29 +00:00
Robin Dunn
a30565f99d Use a relative link for wx-config so it will also work even when not located at the install prefix. Ported from the wxPy-2.9.1.1 tag/branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-22 19:20:31 +00:00
Robin Dunn
be7a5775d2 Explicitly specify the Mac SDK for wxPython builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-22 19:18:47 +00:00
Václav Slavík
64c70359a7 Return wxWindow* from wxDataViewCustomRenderer::CreateEditorCtrl().
There's no reason to limit custom editor controls to wxControl, which
would rule out e.g. composite controls or any custom widgets.
Make appropriate changes to related functions and code too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-22 18:25:32 +00:00
Stefan Csomor
68dd2c52a4 osx 64 bit multilib build needs an explicit export as in this architecture our visibility flags get respected for obj-c classes as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-22 15:48:13 +00:00
Stefan Csomor
c1313b54c6 implementation of HotKey, see #12354
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-22 15:20:11 +00:00
Václav Slavík
b4f70f7706 Compilation fix for DEFINE_GUID uses.
DEFINE_GUID doesn't define the value, only declares an external
variable, unless initguid.h was included. This leads to linker errors.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-22 14:50:20 +00:00
Dimitri Schoolwerth
fa5d9d2006 Fixed wxUSE_STD_STRING==0 compilation.
With at least MSVC9 numformatter.cpp wouldn't compile because of unknown identifiers related to locales. Include <locale.h> in case wxUSE_STD_STRING is set to 0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-22 10:43:47 +00:00
Vadim Zeitlin
0f0c5856e0 Define ACO_AUTOAPPEND for MinGW/Cygwin.
Apparently this symbol is not defined in MinGW headers neither, so do it
ourselves as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-21 23:43:27 +00:00
Vadim Zeitlin
c621269778 Use "wx" prefix for the GUIDs we (re)define in wxMSW code.
CLSID_AutoComplete became ambiguous with MinGW because it does define it in
its shlguid.h header (although MSVC/Platform SDK does not define this one) so
use a "wx" prefix for it to avoid ambiguity. Also use the same prefix for the
IID_IAutoCompleteDropDown value we define for consistency.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-21 23:43:23 +00:00
Vadim Zeitlin
78f250a46d Redefine IAutoCompleteDropDown in our code as it's not always available.
MinGW doesn't have shobjidl.h header file which is normally part of the
Platform SDK and doesn't have IAutoCompleteDropDown interface definition in
any of its headers at all, so define this interface and its IID ourselves to
make the code compile with it.

Notice that MinGW-64 does have the interface declaration but still doesn't
define IID_IAutoCompleteDropDown.

So to be on the safe side just always define everything ourselves, as long as
we need to do it for one of the compilers, it's not more difficult to do it
for all of them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-21 15:47:37 +00:00
Julian Smart
987695522c Added ForceDelayedLayout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-21 12:44:26 +00:00
Dimitri Schoolwerth
daa3165144 Make use of SetFilterIndex in wxOSX-Cocoa's file dialog.
Previously the file type would solely be based on the extension of the passed filename. This is still done, but any valid filter index as set by the user will now take precedence.

See also #12429.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-20 14:54:56 +00:00
Dimitri Schoolwerth
0d1cd87409 Fixed saving dialog's filter index always being -1 with wxOSX-Cocoa.
This problem was reproducable using the Save file dialog in the dialogs sample.
The member m_filterIndex was only initialised to -1 and never set at another point. Set it to the filter's selection during ModalFinishedCallback.

Closes #13158.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-20 07:53:07 +00:00
Paul Cornett
753cba1a75 fix conversion of gdk_input_add() to g_io_add_watch() from r67326
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-19 05:17:45 +00:00
Vadim Zeitlin
6d07584544 Do send wxEVT_UPDATE_UI events to hidden windows.
Failing to send wxEVT_UPDATE_UI to hidden windows made it impossible to show
them from their update UI handler which was totally unexpected as the
documented wxUpdateUIEvent::Show() method could never be used.

Do send these events to the hidden windows themselves but avoid sending the
update UI events to the children of hidden windows as this is really useless
because any change of their state wouldn't be seen by the user anyhow (even if
the child is shown, it would still remain hidden until its parent is) and
would just waste time processing a lot of needless events.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-18 23:50:14 +00:00
Vadim Zeitlin
935594c16e Don't send wxWindowDestroyEvent if we hadn't sent wxWindowCreateEvent.
Don't generate wxWindowDestroyEvent when destroying the windows that had been
never created for symmetry with wxWindowCreateEvent which wasn't sent for this
window neither.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-18 23:36:46 +00:00
Vadim Zeitlin
4af2a59fbf Don't assert when destroying a never created window in wxGTK.
The other ports don't assert if a default-constructed wxWindow object for
which Create() had never been called is Destroy()d and wxGTK shouldn't do this
neither.

The new behaviour is more logical but also fixes a problem with an assert in
wxOwnerDrawnComboBox that can currently be seen in wxGTK unit tests.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-18 23:36:42 +00:00
Vadim Zeitlin
8d43e8c68f Correct a typo in DoAutoCompleteCustom() stub in wxMSW.
Fix a compilation error introduced by r67518.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-18 13:47:51 +00:00
Jaakko Salli
25b7a51fbf Use Connect() to bind embedded wxTextCtrl events instead of event table. This seems to be more reliable approach here, and fixes a bug with wxPropertyGrid's wxEditEnumProperty.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-18 10:06:08 +00:00
Jaakko Salli
26844be538 In wxComboCtrlBase::OnTextCtrlEvent(), make sure to call event.StopPropagation() only after it has been copied
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-18 10:03:16 +00:00
Jaakko Salli
b556474c5d Also show EVT_TEXT_ENTER in the combo sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-18 09:58:27 +00:00
Vadim Zeitlin
a0f01cb25c Correct wrong port-specific note in AutoCompleteFileNames() documentation.
This function is only implemented in wxMSW, not wxGTK2.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-17 23:15:04 +00:00
Vadim Zeitlin
c729f16fa5 Implement auto-completion support for wxTextEntry in wxOSX/Cocoa.
Both completing a set of fixed strings and dynamic completion using a custom
completer are supported, although completing the file names remains MSW-only
for now.

Note that, unlike under MSW, auto-completion under Mac is not automatic and
has to be triggered manually by calling complete: method. This is done by
pressing F5 key by default. In the future we should call it automatically on a
timer event to make it more obviously discoverable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-17 23:14:15 +00:00
Vadim Zeitlin
ed7dda9251 Refactor: extract wxTextCompleterFixed from wxMSW to a header.
This class will be used in other ports too so don't make it private to wxMSW
(although it still remains private to wxWidgets for now as it doesn't make
much sense to use it in user code).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-17 23:14:11 +00:00
Dimitri Schoolwerth
f0cc899914 Removed wxOSX conditional code from generic calendar control.
Tested the calendar sample with Cocoa and Carbon to determine the behaviour and looks are still the same.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-17 21:47:56 +00:00
Dimitri Schoolwerth
01d420639e Improved year control of generic calendar being too narrow when using a locale with long month names.
See #11444.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-17 21:46:22 +00:00
Dimitri Schoolwerth
4be0198dce Removed invalid use of sizeFlags parameter for SetSize call in generic calendar control.
In r39715 the height parameter of a call to SetSize was changed to -1, however the previous coordinate value remained and became the fifth parameter which represents bit flags. Simply removed the fifth parameter.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-17 21:45:36 +00:00
Vadim Zeitlin
0e5d4c38a3 Add wxAffineMatrix2D and related classes.
This class represents an affine 2D transformation and will be used in wxDC for
now and maybe in wxGC later.

Closes #13143.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-17 00:09:56 +00:00
Vadim Zeitlin
6f24b81707 Fix wxXmlDocument::SetRoot() broken by recent changes.
Support for wxXML_PI_NODE introduced in r67346 broke SetRoot() and, because of
this, saving XML documents.

Correct this and add a unit test for this method.

Closes #13135.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-17 00:09:45 +00:00
Vadim Zeitlin
32bd17fcb5 Define wxTextEntry::DoAutoCompleteStrings() stub in wxMSW code too.
Forgot to define this function in !HAS_AUTOCOMPLETE case. This fixes linking
problems with old compilers/headers such as VC6 with its original SDK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 23:17:44 +00:00
Vadim Zeitlin
85047589a9 Split wxTextCompleter into a base class and wxTextCompleterSimple.
Allow overriding either the iterator-like methods of the base class or the
single and possibly more convenient, albeit slightly less efficient, method of
the derived wxTextCompleterSimple class.

This makes it possible to completely delegate to wxTextCompleter from wxMSW
IEnumString implementation and actually makes the code there easier, even if
it it still not quite trivial because of multi-threading concerns.

It also would make it possible to show the completions progressively, as they
are retrieved, in a future generic implementation of auto-completion (MSW
native implementation doesn't do this unfortunately and waits until all of the
completions become available before showing them).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 17:27:34 +00:00
Vadim Zeitlin
e71e4c932a Don't block the main UI thread while generating completions in wxMSW.
The native IAutoComplete implementation takes care to retrieve the completions
from a background thread to prevent the UI from freezing while they're being
generated, but we worked against it by always generating all the completions
from the main thread and just enumerating them from the background one.

Change this now and call wxTextCompleter::GetCompletions() method from the
background thread itself to never block the main one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 17:27:30 +00:00
Vadim Zeitlin
b9a46ea5a2 Use ACO_AUTOAPPEND option for text completion in wxMSW.
This option appends the first candidate completion value to the text control
itself making it more user-friendly as it reduces the amount of typing needed
to enter it.

See #11465.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 17:27:26 +00:00
Vadim Zeitlin
1afe4f9b47 Added private wxEVT_AFTER_CHAR event for wxMSW implementation needs.
This event is sent by wxMSW after the default handling of WM_CHAR has taken
place. It can be used to define an event handler triggered by key presses and
having access to the new value of the control, updated to take the last key
press into account.

This event will be used by auto-completion implementation for wxMSW only for
now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 17:27:21 +00:00
Vadim Zeitlin
ea98f11c2f Add support for dynamic auto-completion in wxTextEntry.
Add wxTextCompleter class which allows to return the possible completions
dynamically and wxTextCompleter::AutoComplete() overload using it. So far this
is only implemented for wxMSW.

Also fix calling wxTextEntry::AutoComplete(wxArrayString) multiple times under
MSW, this didn't correctly update the list of shown completions before.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 17:27:16 +00:00
Vadim Zeitlin
6b30ffedb1 No changes, just simplify preprocessor checks in wxMSW wxTextEntry.
Separate !HAS_AUTOCOMPLETE stub versions from the real one as the code was
too difficult to read otherwise and would become even more so after the
addition of the upcoming custom auto-completer support.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 17:27:11 +00:00
Vadim Zeitlin
574479e8db Refactor wxTextEntry::AutoComplete() to simply call DoAutoCompleteXXX().
No real changes, just make the public AutoComplete() non-virtual and add
virtual DoAutoCompleteXXX() methods to make it easier to add new public
AutoComplete() overloads in the upcoming commits.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 17:27:04 +00:00
Stefan Csomor
058e3f1b54 adding missing part when using the native paint CGContextRef on osx, see #11853
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 16:59:44 +00:00
Stefan Csomor
639e9c7d5b supprting flag for pixel offsetting for msw, see #11853
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 13:07:11 +00:00
Stefan Csomor
ad967c5b98 supprting flag for pixel offsetting for osx, see #11853
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 13:05:17 +00:00
Stefan Csomor
136a1de914 supprting flag for pixel offsetting for cairo, see #11853
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 12:47:22 +00:00
Stefan Csomor
0217cfa537 support generic flag for pixel offsetting, see #11853
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-16 12:21:37 +00:00
Dimitri Schoolwerth
e78c47e3b8 Replaced C++ comments with C ones in C files.
Replaced C++ comments (occurring outside of __cplusplus blocks) in files that contain the warning "THIS IS A C FILE" with C comments.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-15 19:18:34 +00:00
Paul Cornett
f5c0761f51 workaround for broken window managers which claim to support _NET_REQUEST_FRAME_EXTENTS, but don't respond to it
see #13146


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-15 18:31:57 +00:00
Jaakko Salli
35f8ae6572 Removed wxPG_DOUBLE_BUFFER constant. Now all wxPG rendering is done double-buffered, regardless of the platform. Code path with wxPG_DOUBLE_BUFFER = 0 did not render correctly (fixes #13140). In future should probably use wxAutoBufferedPaintDC or something similar, but this will require non-trivial code changes and testing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-15 09:23:23 +00:00
Jaakko Salli
63722a74b0 Rebuild textctrl events using copy ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-14 13:22:40 +00:00
Jaakko Salli
b718a533ac wxEVT_COMMAND_TEXT_UPDATED events from wxComboCtrl's embedded wxTextCtrl kept confusing wxPropertyGrid::HandleCustomEditorEvent(). We need to ignore them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-13 16:39:06 +00:00
Jaakko Salli
8fd38e3369 Completely re-construct the wxComboCtrl textctrl-events instead of just redirecting them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-13 16:35:59 +00:00
Stefan Csomor
00ba1af984 preparing for completions support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-13 09:22:17 +00:00
Jaakko Salli
1d037f6cc8 Describe what re-implemented wxComboPopup::DestroyPopup() should do
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-12 09:35:04 +00:00
Jouk Jansen
44a765d14f Update Makefile for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-11 10:23:37 +00:00
Jouk Jansen
8785530569 revoke OpenVMS dependend part of r67326
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-11 09:36:56 +00:00
Vadim Zeitlin
0287ae5c75 Re-define push_back() in wxSortedArrayString to behave correctly.
Adding items to wxSortedArrayString should always keep them sorted but while
Add() did this, push_back() didn't breaking the class invariant.

Redefine push_back() in _WX_DEFINE_SORTED_TYPEARRAY_2 macro to fix this and
add a unit test checking that wxSortedArrayString::push_back() does work now.

Closes #13134.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-10 15:36:07 +00:00
Vadim Zeitlin
ceb9b8db81 Allow customizing AUI tab colours in wxAuiTabArt.
Add wxAuiTabArt::SetColour() and SetActiveColour() methods and provide trivial
default implementation of them in wxAuiDefaultTabArt to allow customizing the
tab colours.

Closes #11411.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-10 15:36:03 +00:00
Vadim Zeitlin
4bd9bdf33b Fix off by one pixel error when drawing active tab in wxAUI.
The active tab had a drawing artefact because its gradient background was
drawn in a rectangle one pixel too short.

See #11411.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-10 15:36:00 +00:00
Vadim Zeitlin
ea9fee8541 Correct Javanese language code.
It is "jv" and not "jw", the latter was an error in a previous edition of ISO
639 standard and was corrected since then.

Closes #13131.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-10 15:35:56 +00:00
Julian Smart
c1dd924de0 Correction to position in character insertion event when also deleting selected text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-09 10:28:45 +00:00
Stefan Csomor
26632ccd72 fixing configure builds for iphone
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-09 09:22:51 +00:00
Stefan Csomor
89db201aba see #9715
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-08 16:31:12 +00:00
Stefan Csomor
bbca44f104 workaround OSX bug, fixes #4555
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-08 15:09:38 +00:00
Stefan Csomor
f27479e6bd support 3.X deployment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-08 12:16:41 +00:00
Jouk Jansen
472b795e53 Update OpenVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-08 08:08:10 +00:00
Stefan Csomor
9061b0300c adding 10.5 APIs to avoid CGErrors, fixes #13121
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-07 12:55:36 +00:00
Paul Cornett
736722fb4d build fix for wxUSE_LOG==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 17:04:12 +00:00
Paul Cornett
4c2ea5999b avoid GCC warning "suggest braces around empty body in an ‘else’ statement"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 17:03:31 +00:00
Paul Cornett
628e8d444c fix typo from r67326
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 17:02:28 +00:00
Vadim Zeitlin
02c9435466 Fix vararg function in wxXml unit test broken by recent changes.
The changes in r67345 changed CheckXml() vararg function to take a reference
as the first argument but this doesn't work with va_start(), so revert to
using a pointer here.

This fixes the current unit test failures in the XML tests.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 16:37:24 +00:00
Vadim Zeitlin
3672f9d04d Avoid dereferencing invalid iterator in wxMessageDialog code.
The iterator wxString::rbegin().base()+1 is invalid so check that we don't use
it.

Closes #13126.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 14:37:36 +00:00
Vadim Zeitlin
cee25be77b Correctly restore the old locale in wxXLocale functions.
In non-wxHAS_XLOCALE_SUPPORT case we didn't restore the original locale
correctly in wxStrtoxxx_l() functions as the return value of wxSetlocale() was
incorrectly assumed to be the old locale instead of the new one.

Fix this and also replace the macros used by the old code with a small helper
class, this simplifies the code and is less ugly.

Finally add a unit test which failed before these changes when the program ran
in any non-C locale but passes now.

Closes #13117.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 14:37:32 +00:00
Vadim Zeitlin
fd1c361c33 Fix incorrect use of setlocale() in wxLocale::IsAvailable().
The return value of setlocale() was used incorrectly in this code: it
represents the newly set locale and not the previously active one so we didn't
actually restore the original locale before.

Fix the code and check that we do actually restore the locale in a new unit
test for it.

See #13117.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 14:37:27 +00:00
Jouk Jansen
3668a4f69e Update OpenVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 08:53:57 +00:00
Jouk Jansen
655e246b86 Fix for broken wxGTK1 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 08:47:45 +00:00
Vadim Zeitlin
e042c3b582 Don't do anything in WX_ASSERT_FAILS_WITH_ASSERT when wxDEBUG_LEVEL==0.
We can't test for assert failure when using a build of wxWidgets in which
asserts don't exist at all.

Closes #13119.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-05 22:29:58 +00:00
Vadim Zeitlin
cda937864f Fix VarArgTestCase compilation when type traits are unavailable.
When type traits are unavailable we can't check whether a type can be passed
to a vararg function but we still need to pass a copyable object to
wxString::Format() for the code to compile, even if we just want to check that
it will fail with the assert at run-time.

Closes #13118.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-05 22:29:55 +00:00
Paul Cornett
04e4045183 build fix for gtk1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-05 15:50:54 +00:00
Dimitri Schoolwerth
88def1632e Compilation fixes for wxUSE_LOCALE and wxUSE_XLOCALE set to 0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-04 22:07:42 +00:00
Julian Smart
326c0adbfc Corrected XML conversion in style names and face names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-04 17:56:53 +00:00
Julian Smart
b3169c12bc Further commenting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-04 17:55:56 +00:00
Dimitri Schoolwerth
3fdcd5d5ab Changed licence references to "wxWindows licence".
Use "wxWindows licence" and not "wxWidgets licence" and also use British spelling for licence. Updated new occurrences in recently added files and a couple of previously (r64940) missed ones.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-04 09:21:52 +00:00
Dimitri Schoolwerth
a5a0ba3dbd Fixed failing image test.
ImageTestCase::DibPadding was always failing due to differences in pixel data between the decoded GIF and encoded ICO image. Instead of comparing image content just check if the saving of the ICO succeeds (prior to r67296 it would crash).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-03 22:41:58 +00:00
Dimitri Schoolwerth
fa68bafba7 No code changes, fixed forgotten typo that is a part of r67384.
See #13076.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-03 20:52:18 +00:00
Dimitri Schoolwerth
d13b34d3f2 No code changes, fixed various typos.
Applied patch by snowleopard2 fixing typos in interface/. Extended the fixes throughout trunk.

Closes #13076.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-03 20:31:32 +00:00
Paul Cornett
a17305ea87 For wxGTK2, link with X11 explicitly, since we use many X11 functions directly.
Some linkers, notably newer Linux ones, don't implicitly link against dependent libs
Fixes #13100


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-03 05:19:59 +00:00
Vadim Zeitlin
640a1b8474 Disable wxUSE_STD_CONTAINERS by default for MSVC6.
This compiler can't compile its own standard headers with the default options
as it overflows an internal heap. Disable the use of standard containers by
default for it to avoid this problem and indicate that /Zm option must be used
to avoid this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 23:31:27 +00:00
Paul Cornett
ba9eca1aef make sure value label updates even if handle position does not change, fixes #13042
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 22:19:44 +00:00
Paul Cornett
8ca8714b3c need to override DoGetBestClientSize() to get correct size, fixes #13088
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 20:43:29 +00:00
Paul Cornett
4f4f76dee4 fix overwrite of upper left part of parent window with sunken/raised border, fixes #13072
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 18:28:52 +00:00
Vadim Zeitlin
b2a1c6f51b No real changes, just some more minor cleanup in wxSVGFileDC.
Harmonize spaces, remove unnecessary semicolons, remove useless return
statements from void functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:38:04 +00:00
Vadim Zeitlin
af58e08750 Remove wxSVG_DEBUG from wxSVGFileDC.
Remove the weird wxSVG_DEBUG which could apparently be used to trace the code
execution by triggering asserts in all functions. This is really not the right
way to implement tracing and seems pretty useless, just remove it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:38:02 +00:00
Vadim Zeitlin
85675f1019 Clean up of string operations in wxSVGFileDC code.
Use operator+=() instead of "s = s + ...".

See #13086.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:37:58 +00:00
Vadim Zeitlin
403695b323 Add support for alpha channel in colours in wxSVGFileDC.
Use stroke-opacity and fill-opacity SVG attributes to handle pens and brushes
created from colours with alpha channel in wxSVGFileDC.

Closes #13086.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:37:54 +00:00
Vadim Zeitlin
b72ed64277 No changes, just merge some strings in wxSVGFileDC.
Concatenate string literals at compile-time instead of run-time.

See #13086.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:37:50 +00:00
Vadim Zeitlin
f645356813 Use wxPENSTYLE_XXX and wxBRUSHSTYLE_XXX instead of wxXXX constants.
Use non-deprecated constants in wxMSW wxGC code.

Closes #13109.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-02 16:37:44 +00:00
Paul Cornett
554895848b build fix for GTK1 after r67299
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-01 16:20:17 +00:00
Jaakko Salli
df3c4a42d9 Added wxComboPopup::DestroyPopup(), which responsibility is to call Destroy() for the popup control and also delete the combo popup object itself. The default implementation should be able to handle common cases.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 17:22:51 +00:00
Julian Smart
a3c125765f Buffer size calculation correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 13:11:14 +00:00
Jouk Jansen
4ac8367504 Update configuration for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 10:52:30 +00:00
Vadim Zeitlin
3130a8d014 Compilation fix for wxUSE_STL==1 build after r67356.
An explicit conversion to char* is required in wxUSE_STL build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 10:08:41 +00:00
Vadim Zeitlin
b129eaa377 Implement wxGraphicsContext::GetSize() for Cairo.
As the implementation of this method is basically the same for all ports move
it to the base class itself instead of requiring the derived classes to
implement it. Now the derived classes need to fill in m_width and m_height
members instead.

Do fill them when creating wxGraphicsContext in Cairo version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 09:38:03 +00:00
Vadim Zeitlin
cdcc1edaf2 Tentative compilation fix for wxMSW with MinGW after STL changes.
Include wx/stack.h, which includes the standard <stack> header, before
<windows.h> as the latter redefines min and max as macros conflicting with the
standard headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 09:37:59 +00:00
Vadim Zeitlin
6e793355df Add wx/msw/panel.h to the list of wxMSW headers in bakefile.
Also move src/msw/panel.cpp to the list of normal wxMSW sources from the list
of low-level ones as it's not needed by wxUniv.

Closes #13103.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 09:28:47 +00:00
Vadim Zeitlin
f0e52da8dc Fix alpha handling in CSS syntax in wxColour in non-"C" locale.
Use locale-independent functions to parse and generate the floating point
alpha representation in CSS syntax for colours to make it work in locales
which don't use period as decimal separator.

Closes #13077.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 09:28:41 +00:00
Vadim Zeitlin
a99a3029c8 Fix HMENU to wxMenu translation in wxMSW code.
We didn't find the menus corresponding to the submenu handles. This resulted
in incorrect processing of EVT_UPDATE_UI events for the submenus and probably
other problems.

Fix this by searching for the HMENU recursively in all menus.

Closes #13080.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 09:28:38 +00:00
Vadim Zeitlin
40cb56e248 Document unexpected wxWindowDisabler taskbar UI in wxMSW.
It may be unexpected that the application can still be closed from the taskbar
even if its main window is disabled. Mention this in the documentation and
indicate how to prevent this from happening if required.

Closes #13081.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 09:28:34 +00:00
Vadim Zeitlin
25941fc53b Correct wxGraphicsContext::StrokeLines(n, points) documentation.
This method draws a single polyline.

Closes #13099.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-31 09:28:30 +00:00
Vadim Zeitlin
02f170d7be Remove REMOVE_UNUSED_ARG option from setup.h files.
This identifier wasn't used anywhere as WXUNUSED() is always defined as
nothing for all compilers since quite some time.

Also moved wxUSE_IOSTREAMH together with the other wxUSE_STD_XXX options and
removed the "compiler (mis)features" section which became empty after doing
this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-30 14:16:25 +00:00
Vadim Zeitlin
cee8636e94 Add support for elements preceding the document node in wxXML.
This is mainly useful for parsing and generating processing instructions but
can be used for any kind of elements, e.g. also comments, occurring before the
document node in XML documents.

Closes #11593.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-30 14:16:19 +00:00
Vadim Zeitlin
e8afaabf01 Fix memory leaks in wxXml unit test.
Ensure that the root wxXmlNode is deleted by storing it in a wxScopedPtr
instead of a raw pointer.

See #11593.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-30 14:16:13 +00:00
Vadim Zeitlin
c180fd77f4 Always update internally stored AUI floating frame position.
Update the internally stored position of a floating AUI frame even if the user
is dragging it too fast to update its position on screen. This prevents the
frame from snapping back to the initial position when movement is over.

Closes #13014.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-30 14:16:07 +00:00
Vadim Zeitlin
01871bf642 Add wxUSE_STD_CONTAINERS and turn it on by default.
Previously, wxUSE_STL enabled both implicit conversion of wxString to
std::[w]string and use of standard containers for the implementation of their
wx equivalents. Split up the two roles now by allowing to enable the use of
the standard containers independently of (backwards incompatible) implicit
conversion in wxString and actually enable wxUSE_STD_CONTAINERS by default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-30 14:16:04 +00:00
Vadim Zeitlin
44a0071224 Fix XTI compilation in STL build.
Use explicit c_str() calls in XTI code as implicit conversion to "const char
*" doesn't exist in STL build.

This fixes compilation problems when wxUSE_EXTENDED_RTTI && wxUSE_STL.

Closes #13087.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-30 14:15:53 +00:00
Paul Cornett
6c875e80e7 build fix for older GTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-30 05:59:34 +00:00
Paul Cornett
a481bbc318 convert assertdlg_gtk to C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-30 05:35:24 +00:00
Paul Cornett
23b22b10a8 prepare to convert file to C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-30 05:29:49 +00:00
Stefan Csomor
0dcbb107ee fix clang warning (? having two different operand types)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-29 18:40:18 +00:00
Paul Cornett
5073caddb1 must use deprecated function for gtk2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-29 17:49:36 +00:00
Paul Cornett
c96acfeff6 don't crash on error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-29 05:29:42 +00:00
Paul Cornett
86b8b3ac31 build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-29 05:17:00 +00:00
Paul Cornett
7c491c85de fix typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-29 05:16:25 +00:00
Paul Cornett
ad47660f9a GTK_WIDGET_SENSITIVE should have been converted to gtk_widget_get_sensitive
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-29 05:15:54 +00:00
Václav Slavík
34b239ec5d wxDataViewChoiceRenderer's editor control should have the same size as the cell.
It looks weird when it's significantly shorter than the content cell being edited.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-28 14:10:31 +00:00
Paul Cornett
385e8575dd avoid deprecated functions and direct struct access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-28 06:27:49 +00:00
Paul Cornett
989d151ce2 yet more avoiding direct struct access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-27 19:38:10 +00:00
Paul Cornett
a8886b11f2 add more functions we will need
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-27 18:41:07 +00:00
Jaakko Salli
a516284f67 Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup control obtained via GetControl() member function. Also still delete m_popupInterface if there was no popup control, or if it was implemented as a separate class (versus being multiple-inherited along side wxComboPopup, as has been the common practice).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-27 18:30:56 +00:00
Václav Slavík
0b669520c2 Always use gtk2-compat.h definitions.
We support building against newer GTK+ version and using an older
one at runtime, so we must provide our implementations of these
functions even if GTK_CHECK_VERSION would indicate the function is
already available in GTK+.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-27 17:23:43 +00:00
Václav Slavík
8bffcd08c2 Renamed wx/gtk/private/compat.h to gtk2-compat.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-27 17:23:39 +00:00
Paul Cornett
08f0950400 more avoiding direct struct access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-27 07:17:05 +00:00
Paul Cornett
281644b4c1 remove unused mouse event and redundant checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-27 06:51:28 +00:00
Paul Cornett
2bca0d2033 a few changes for gtk3, avoiding direct struct access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-27 06:38:44 +00:00
Václav Slavík
d58a44c371 Compilation fix for r67312: add explicit cast to GtkStateType.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-26 18:09:58 +00:00
Václav Slavík
fc9ab22a76 Use accessor functions instead of deprecated GTK+ macros.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-26 15:49:57 +00:00
Julian Smart
8337ae1e40 Fix for image saving speedup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-25 16:42:02 +00:00
Václav Slavík
80b8c88a63 Don't use deprecated gtk_widget_ref().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-25 15:08:25 +00:00
Václav Slavík
d6355645e7 Revert r67137.
GTK_DISABLE_SINGLE_INCLUDES causes trouble with other included
libraries (libgnomeprint this time) too. This check for trivially fixed
problems is not worth the continuing trouble.

Fixes #13078.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-25 11:00:56 +00:00
Paul Cornett
fbf49ef2b1 fix tool item enter/leave notify, fixes #13083
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-24 16:52:55 +00:00
Vadim Zeitlin
af2fdacdb8 Set m_inheritBgCol flag in wxPanel with a background bitmap.
This ensures that the panel background is used by its transparent children
under wxMSW even when the panel itself is inside a wxNotebook with themed
background: making InheritsBackgroundColour() return true prevents the
notebook from overriding our background.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-24 16:08:11 +00:00
Julian Smart
4dc7ae1ae8 Speeded up image saving to XML (WriteHex).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-24 10:59:47 +00:00
Paul Cornett
879e4f6e19 move deprecated GtkTooltips forward declaration to one place that still needs it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-23 17:37:14 +00:00
Paul Cornett
558a94bd4a clean up wxGTK tooltip code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-23 17:36:10 +00:00
Dimitri Schoolwerth
2a6545a5a7 Fixed buffer overflow when saving certain images in the Windows icon format.
When an image did not have a width with a multiple of 4 the calculations for the number of padding bytes (to get a scan line DWORD aligned) would be wrong. This caused a buffer overrun when saving the 1 bits per pixel mask.

Fixes #12937.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-23 15:20:25 +00:00
Václav Slavík
fce2dc61c3 Only react to clicks on the checkbox in wxDataViewToggleRenderer.
Previously, left click anywhere in the cell toggled the checkbox.
This was unexpected when the cursor was far from the checkbox
in a wide column. With this change, one has to be over the
checkbox to toggle it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-23 13:57:52 +00:00
Vadim Zeitlin
09bdb1cb3e Add WXK_CONTROL_A..WXK_CONTROL_Z constants.
These key codes provide nicer symbolic values for ASCII values in 1..26 range
generated by Ctrl+Letter keys.

Closes #13075.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-23 12:59:59 +00:00
Vadim Zeitlin
6c1de05621 Prevent event generation in wxGtkCalendarCtrl::SetDate().
Block not only gtk_day_selected_callback() but also gtk_month_changed_callback()
as we don't want wxEVT_CALENDAR_PAGE_CHANGED generated neither when calling
SetDate().

This fixes partial resetting of the just set value in wxDatePickerCtrl as
calling SetDate() there resulted in the date being reset from inside it and
the behaviour of the control was clearly wrong as could be seen in the widgets
sample.

Closes #13073.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-23 10:37:38 +00:00
Vadim Zeitlin
6418e3ae72 Use correct month in the date picker page of the widgets sample.
Months returned by wxDateTime::GetMonth() start from 0 while people mostly
expect to have 1-based months in the UI.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-23 10:37:35 +00:00
Václav Slavík
9445e542a0 Fix <object_ref> processing to respect overridden attributes.
r60494 accidentally broke this, by adding faster code path for
child-less <object_ref>s. Unfortunately, this made it ignore
<object_ref>s without children, but with attributes overrides.

Fixes #13061.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 19:13:28 +00:00
Stefan Csomor
c560088c4d wiring notifications
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 18:44:43 +00:00
Vadim Zeitlin
dd1af40c59 Add wxUSE_THREADS checks around wxMSW functions dealing with threads.
This removes the code unneeded in wxUSE_THREADS==0 build and also fixes
compilation of wxGUIAppTraits::WaitForThread() which didn't compile any more
with wxUSE_THREADS==0 since r67185.

Closes #13050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 17:15:56 +00:00
Vadim Zeitlin
20ca563279 Don't consider fully opaque bitmaps as having alpha in wxMSW.
Remove the alpha channel from the DIB we create not only if all of its pixels
are fully transparent but also if they are all fully opaque. This prevents us
from erroneously creating bitmaps with alpha channel when none is needed nor
expected.

Closes #13056.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 17:15:49 +00:00
Vadim Zeitlin
23a9142e27 Add wxText{Input,Output}Stream::Get{Input,Output}Stream() methods.
These methods simply return the underlying low-level stream.

See #10807.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 17:15:45 +00:00
Vadim Zeitlin
b83144c46f Post size events to the event handler and not window itself.
Post the artificial wxSizeEvent to the window event handler and not window
itself in SendSizeEvent() as otherwise any event handlers wouldn't see this
event at all.

Closes #13066.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 17:15:38 +00:00
Vadim Zeitlin
b78a53aca0 Use disabled version of normal bitmap for disabled one in wxMSW::wxButton.
Initialize the disabled button bitmap with a greyed out version of the normal
one instead of using the same normal bitmap for it. This is more consistent
with the other ports and makes more sense.

Closes #13070.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 17:15:34 +00:00
Stefan Csomor
38e4bfde17 first version of osx_cocoa implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 16:40:28 +00:00
Stefan Csomor
869aa41b51 only remove from parent if not content view, fixes #13068
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 16:39:26 +00:00
Vadim Zeitlin
a3b89fa936 Correctly align background brush when erasing owner drawn bitmaps in wxMSW.
Add a hack to work around the problem with background alignment when drawing
the owner-drawn buttons in wxMSW. This fixes the alignment for any custom
brushes used for background painting but doesn't help with user-defined
EVT_ERASE_BACKGROUND handlers which still don't work well with the owner-drawn
buttons. Unfortunately DrawThemeParentBackground() remains a mystery and I
couldn't understand why not only doesn't it position the DC correctly on its
own but also ignores any attempts to do it manually.

This also doesn't help with the stubbornly remaining one pixel non-transparent
border around non-owner-drawn buttons which I just can't get rid of.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 15:07:20 +00:00
Dimitri Schoolwerth
4c51a665c6 Fixed various typos.
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:17:38 +00:00
Bryan Petty
57ab6f2314 Extensive documentation typo patch (closes #13063).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:08:30 +00:00
Dimitri Schoolwerth
e4e0d4702b No code changes, removed tabs from source file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:06:20 +00:00
Jouk Jansen
6853f5fbf9 Update OpenVMS makefiles for WXMARKUP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 10:57:09 +00:00
Jaakko Salli
9cb80f3fa3 To have better support for themed and custom backgrounds for wxMSW wxComboCtrl, use WS_EX_COMPOSITED and wxBG_STYLE_ERASE instead of custom double-buffering (when made possible by the OS version)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 09:56:40 +00:00
Jaakko Salli
3e4e0908a7 In wxComboCtrlBase::DrawButton(), let the button background rendering changes also apply to buttons with user-defined bitmaps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 08:59:59 +00:00
Jaakko Salli
ef72c99e5b Added entry for recent wxComboCtrl background rendering changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 08:45:48 +00:00
Stefan Csomor
32f701b096 fixes #13064
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 07:10:41 +00:00
Stefan Csomor
8ceae028c1 fixes #12579
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 06:44:08 +00:00
Vadim Zeitlin
55a40ad970 Fix wxMSW build without PCH after recent wxPanel changes.
Add missing include of wx/bitmap.h in !WX_PRECOMP case.

Closes #13060.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-21 11:00:03 +00:00
Vadim Zeitlin
019044877a Allow using milliseconds in wxLog timestamp.
Use wxDateTime::UNow() instead of time() and wxDateTime::Format() instead of
localtime() to make it possible to use "%l" specifier in wxLog time stamp.

Closes #13059.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-21 10:59:59 +00:00
Vadim Zeitlin
ab4387390c Added a simple example of semi-transparent window to the erase sample.
Show how to create a custom control with transparent background.

Notice that this doesn't work in wxGTK currently.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 22:33:25 +00:00
Vadim Zeitlin
fc0ae1e319 Remove keyboard-related code from the erase sample.
This code seems irrelevant in this sample and just complicates it
unnecessarily.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 22:33:21 +00:00
Vadim Zeitlin
c5d0e69d7d Don't draw the mysterious black rectangle in the erase sample.
The black rectangle drawn in EVT_PAINT handler in the sample prevented the
custom background from showing through the wxStaticBitmap. Maybe it was
initially done intentionally but this makes the sample look broken so just
don't do this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 22:33:16 +00:00
Dimitri Schoolwerth
4d37f425ff Made some TIFF reading adjustments.
Read a few TIFF tags that assist with having a similar TIFF file when saving the image again, instead of (by default) always saving as a 24-bit RGB image. Also, in accordance with libtiff, allow reading X and Y resolution values even if the resolution unit tag is not set.

Applied (modified) patch by scottb. Closes #13015.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 19:48:03 +00:00
Vadim Zeitlin
035fa7f78c Fix test for wxHAS_GENERIC_PANEL for PCH-less build.
wxHAS_GENERIC_PANEL is only defined in wx/panel.h so test for it after
including this file, not before.

This fixes link errors due to missing wxPanel symbols in PCH-less builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 11:50:47 +00:00
Stefan Csomor
2c9dad08b2 spinctrl on mac is generic, so the peer is a userpane, fixes #13058
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 11:50:39 +00:00
Jaakko Salli
bed867e3f9 Added wxComboCtrlBase::m_hasTcBgCol. Re-using base wxWindow::m_hasBgCol was trouble.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 11:15:17 +00:00
Jaakko Salli
10ba26777d Redone (generic) wxComboCtrl background painting and handling. The 'actual' wxWindow background colour is now largely ignored and overridden to refer the text-area's background colour instead (as is usually the case with controls like this). Base 'transparent' background is now only painted when double-buffered rendering is required, and otherwise delegated to the system, as appropriate. This should significantly improve control's appearance and compliancy with GTK+ and OS X themes and custom backgrounds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 10:59:22 +00:00
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files.
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:14:35 +00:00
Vadim Zeitlin
cd95f7e65c Add wxPanel::SetBackgroundBitmap().
This method provides a simple way to set a background bitmap without defining
an EVT_ERASE_BACKGROUND handler and, more importantly, one that works
correctly in wxMSW for a window with children as it paints the background of
transparent children too.

Add a test of this method to the erase sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:00:49 +00:00
Vadim Zeitlin
cf858bab79 Deprecate old style wxPanel ctor taking separate coordinates.
wxPanel had a ctor in very old (wx 1.x-compatible?) style which was marked as
"old" and not documented but not officially deprecated. Do deprecate it now in
view of removing it in later releases.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:00:42 +00:00
Vadim Zeitlin
5b87bd6c0b Split wxPanel in wxPanelBase and platform-specific files.
So far we have only wxMSW-specific implementation (and also a trivial
wxUniv-specific one) but it's still tidier to have all platform-specific code
in separate files, especially as we're going to have more of it for wxMSW
soon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:00:38 +00:00
Vadim Zeitlin
0a81f13024 No changes, just refactor wxMSW background brush methods.
Factor out MSWGetCustomBgBrush() from MSWGetBgBrushForChild(). This is useful
as in the vast majority of cases the parent window will want to use the same
background brush for all of its children so it doesn't really care about the
concrete child passed to MSWGetBgBrushForChild() and we can adjust the brush
to the child origin in the common code instead of asking each derived class
overriding MSWGetBgBrushForChild() to do this.

This doesn't change anything but will make the upcoming changes to wxPanel
background painting simpler.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:00:29 +00:00
Vadim Zeitlin
0be027c45b Fix wxRegKey::GetKeyInfo() output parameters in 64 bit builds.
Use intermediate 32 bit DWORD variables for ::RegQueryInfoKey() outputs as
size_t is 64 bit in 64 bit MSW builds and so the variables of type size_t
can't/shouldn't be passed directly to this function to avoid only filling
their lower 32 bits.

Closes #11778.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-19 11:57:13 +00:00
Vadim Zeitlin
0af4bd16a1 Slightly improve wxMouseCaptureLostEvent documentation.
Minor changes to make the event description more clear.

Closes #13052.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-19 11:57:10 +00:00
Vadim Zeitlin
6d090da1e9 Document wxPopupTransientWindow.
Also fix a typo in a comment in the real class declaration.

Closes #13044.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-19 11:57:06 +00:00
Stefan Csomor
d15694e8ca going private with userpane info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-19 08:36:23 +00:00
Dimitri Schoolwerth
0a761908f2 Fixed documentation of enum wxImageResizeQuality.
A C-style comment was not closed and resulted in the explanation of wxIMAGE_QUALITY_NORMAL additionally containing the explanation of wxIMAGE_QUALITY_BOX_AVERAGE and the latter having none. Regression since r67203.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 22:22:01 +00:00
Stefan Csomor
415f4a011a moving userpane attribute into implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 15:45:51 +00:00
Dimitri Schoolwerth
a9a4f22953 Set svn properties on various files throughout the repository (skipped docs/ ).
Added missing svn:eol-style (set to native) and svn:keywords (set to Id) properties to c/cpp/cxx/h/mm files.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 15:10:15 +00:00
Stefan Csomor
8606ee5077 going private for m_peer to give a foundation for better encapsulation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 14:33:57 +00:00
Stefan Csomor
2275632282 going private for m_peer to give a foundation for better encapsulation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 14:20:12 +00:00
Vadim Zeitlin
37204b5d30 Fix exporting clipboard data to primary selection in wxGTK.
Honour the requested selection in our selection handler instead of always
returning the default one resulting in wrong data being pasted when using
primary selection (e.g. middle clicking).

Closes #12947.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 09:16:19 +00:00
Vadim Zeitlin
bd45b3e176 Add wxHtmlHelpController::SetShouldPreventAppExit().
Add a method which can be used to indicate that the help window should prevent
the application from exiting and use it in the help sample to prevent it from
closing prematurely.

Closes #13046.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 09:16:14 +00:00
Vadim Zeitlin
fbe7473406 Limit the search in wxMSW virtual wxListCtrl by time.
Instead of performing the search only up to a certain number of items, do it
for as long as it takes less than the given time threshold (currently fixed at
half a second).

Closes #13038.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 09:16:06 +00:00
Jouk Jansen
6935871895 Update configuration for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-18 07:16:00 +00:00
Vadim Zeitlin
6fec48b709 Add a wxStaticText to the erase simple.
This control explains better what is going on in the sample and also allows to
test whether wxStaticText itself has properly transparent background (this is
not currently the case under MSW).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-17 11:35:37 +00:00
Julian Smart
6d53143092 Fixed problems caused by duplicated names across different style types.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-17 09:46:59 +00:00
Stefan Csomor
057f610bae adding missing newline at end of file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 19:16:13 +00:00
Stefan Csomor
450b43059a removing condition that is always true anyway (unsigned>=0)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 13:15:16 +00:00
Dimitri Schoolwerth
f2c8079119 Added support for reading image resolutions from PNG images.
Patch by scottb. Closes #12893.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 12:46:03 +00:00
Stefan Csomor
e7794cf2fe fixing unused params
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 10:58:46 +00:00
Stefan Csomor
e8fd252ef8 always skip OnSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 10:57:08 +00:00
Stefan Csomor
ea2807a4c4 calling explicit base class constructor from copy constructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 10:56:41 +00:00
Stefan Csomor
e71baaa811 calling explicit base class constructor from copy constructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 10:55:30 +00:00
Stefan Csomor
6485c8d7fb replace usage of objective-c keyword 'id'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 07:22:56 +00:00
Stefan Csomor
4b1d0dbe25 fixing iterator use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 07:18:25 +00:00
Stefan Csomor
616c7cbd92 replace usage of objective-c keyword 'id'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 07:16:10 +00:00
Stefan Csomor
e3b2f973e8 replace usage of objective-c keyword 'id'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 07:06:43 +00:00
Stefan Csomor
163b01c128 replace usage of objective-c keyword 'id'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 07:00:59 +00:00
Stefan Csomor
68ebe5a07f making conversion explicit silences deprecation warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 06:57:03 +00:00
Stefan Csomor
0f54a3be55 signed/unsigned warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 06:49:51 +00:00
Stefan Csomor
1cf59cb178 signed/unsigned warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 06:40:07 +00:00
Stefan Csomor
c1ec7ee8a1 replace usage of objective-c keyword 'id'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 06:36:43 +00:00
Stefan Csomor
a624c97f0a silence incorrect warning about missing return value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-16 06:34:20 +00:00
Stefan Csomor
31c659e82e fixing iphone build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-15 20:21:39 +00:00
Dimitri Schoolwerth
fdb7d5bbc2 Changed behaviour of wxImageResizeQuality parameter in wxImage.Scale and wxImage.Rescale.
Made the following changes:

* Formerly specifying to resize using wxIMAGE_QUALITY_BICUBIC or wxIMAGE_QUALITY_BILINEAR could result in the ResampleBox method being used. Now always resize with the method that the user actually specified.

* Added wxIMAGE_QUALITY_BOX_AVERAGE to explicitly allow resizing with the ResampleBox method.

* Previously wxIMAGE_QUALITY_HIGH was equal to wxIMAGE_QUALITY_BICUBIC. It has been changed to use wxIMAGE_QUALITY_BOX_AVERAGE when reducing the size of an image and wxIMAGE_QUALITY_BICUBIC in all other cases.

Closes #12845.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-15 16:42:34 +00:00
Dimitri Schoolwerth
41774f1b20 Changed wxImage.ResampleBox to always use a box size of at least 2 by 2 pixels.
Previously when resizing by more than 50% (for example resizing from 100x100 to 51x51 or 140x140) a box size of 1x1 would be used which effectively would give the same result as using nearest neighbour. Make sure that at least a box size of 2x2 pixels is always used.

Patch by scottb, see also #12845.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-15 16:37:04 +00:00
Vadim Zeitlin
bd448041e7 Always use icons with wxToolbook in the notebook sample.
wxToolbook asserts and doesn't work if it has no images so always use them
with it in the sample to avoid it.

Closes #11656.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-15 11:10:46 +00:00
Vadim Zeitlin
825ce0af4f Use consistent sizes for all icons used in the button page of widgets sample.
Explicitly pass wxART_BUTTON to wxArtProvider to ensure that all the icons are
returned in the same size, otherwise they didn't look well and could result in
an assert too, see #12909.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-15 11:10:42 +00:00
Vadim Zeitlin
cb7ef329e7 Fix setting tooltips for generic wxSpinCtrl.
Forward the tooltip set for the control to its subcontrols.

Closes #9817.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-15 11:10:38 +00:00
Vadim Zeitlin
8c40af9430 Document wxEVT_COMMAND_SLIDER_UPDATED in wxSlider documentation too.
This even was only documented in wxCommandEvent documentation but not in
wxSlider, mention it there too.

Closes #12292.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-15 11:10:34 +00:00
Vadim Zeitlin
1f4d7e441c No changes, just clean up wxSVGFileDC code a little.
Use literal strings instead of macros such as "newline", "space" and
"semicolon" and also use wxColour::GetAsString() instead of reimplementing it.

Closes #13037.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 23:25:58 +00:00
Vadim Zeitlin
8864388cf2 Show wx{Note,Tool}book-specific styles in the notebook sample too.
Demonstrate the use of styles such as wxNB_FIXEDWIDTH or wxTBK_HORZ_LAYOUT
specific to particular controls and not only the ones common to all of them.

Closes #13036.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:55:05 +00:00
Vadim Zeitlin
5c16a69952 Don't generate wxEVT_CHAR_HOOK events while the mouse is captured.
This prevents the parent TLW from interfering with the keyboard handling of
the window that captured the mouse which very often needs Escape for itself to
cancel the capture.

In particular, this fixes the problems with Escape closing the entire dialog
containing the controls instead of closing just the combobox drop down or a
popup menu in wxMSW.

Also modify wxGTK for consistency and update the documentation.

Closes #12952.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:55:01 +00:00
Vadim Zeitlin
ff45048665 Document EVT_CHAR_HOOK.
Explain that it is sent to the active TLW and not the focus window and that
handling it suppresses all the normal keyboard events.

Mention that it is not generated by wxOSX/Cocoa currently, see #12431.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:54:55 +00:00
Vadim Zeitlin
982bc2e421 Don't intercept Escape key while IME is active.
Escape is used by IME and intercepting it at wxWidgets level to generate
EVT_CHAR_HOOK breaks the IME UI and may result in unexpected loss of data
entered by user.

To work around this, don't generate EVT_CHAR_HOOK for Escape while IME is
active by checking for the special semaphore variable (which could be also
used for other things in the future, see #9102) value.

Closes #11386.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:54:51 +00:00
Vadim Zeitlin
caef3ffacc Produce correct SVG files in all locales.
Using wxSVGFileDC in locales using comma as decimal separator resulted in
invalid SVG files being created as a decimal period should always be used in
them.

Fix this by replacing "%g" format specification with wxString::FromCDouble()
call (wrapped in a convenient NumStr() helper function).

Closes #12008.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:54:43 +00:00
Vadim Zeitlin
ce39ca74bc Fix changing the size of the bitmaps in wxMSW wxButton.
The size of the wxImageList used to store the bitmaps wasn't updated before
and so the old bitmap size continued to be used even after changing the actual
bitmaps.

Recreate wxXPButtonImageData to ensure that the image list size does change.

Closes #12909.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:54:39 +00:00
Vadim Zeitlin
32eec436ed Print everything by default in non-interactive mode.
IF we don't show the dialog allowing the user to select the pages range, we
should print everything by default instead of printing nothing at all as we
used to do.

Closes #12998.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:54:35 +00:00
Vadim Zeitlin
b95a7c3144 Allow wxThread::Wait() and Delete() to block, even under wxMSW.
Add "wait mode" parameter to these methods which can be used to make them
block even under wxMSW where they currently dispatch messages when called
which can be totally unexpected.

Do keep the old behaviour for compatibility however, although it will change i
3.2.

Closes #12998.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:54:32 +00:00
Vadim Zeitlin
31dcbd12ef Respect alignment flags for owner-drawn buttons in wxMSW.
Honour wxBU_{LEFT,RIGHT,TOP,BOTTOM} flags for owner drawn buttons too, this
ensures that you can both change the colour and align the text differently for
buttons under XP and later.

Closes #12995.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 11:54:26 +00:00
Julian Smart
2631773e82 Added initialisation and checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-14 10:27:01 +00:00
Vadim Zeitlin
fd3a4cb92d Added precision parameter to wxString::From[C]Double().
Optionally support fixed precision in wxString::FromDouble() and FromCDouble()
methods. This is mostly useful for the latter to be able to format numbers in
portable way (using dot as decimal separator) without loss of precision but
also do it for the former for consistency.

Closes #12973.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-13 13:53:54 +00:00
Vadim Zeitlin
17a8f66c75 No changes, just correct a wrong trailing comment in #else.
The test meaning was inverted.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-13 13:53:51 +00:00
Vadim Zeitlin
50a2a3553a Document wxTE_MULTILINE support in wxTextEntryDialog.
It wasn't immediately obvious that this dialog could be used for multiline
text entry too so mention it explicitly in the documentation.

Also show this in action in the dialogs sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-13 13:33:12 +00:00
Stefan Csomor
90dad08e77 add external utf16 text type explicitely, as it otherwise gets treated like plain-text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-12 15:57:37 +00:00
Stefan Csomor
e9020f0b22 supporting 24 and 64 sizes via scaling up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-11 19:54:44 +00:00
Stefan Csomor
8383e673b1 under cocoa a too-small static box leads to erroneous layout information, therefore use fixed code layout info, fixes #13006
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-10 18:56:58 +00:00
Stefan Csomor
bda7c3535e safeguard against not-yet-shown view which leads to crashes under OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-10 18:55:55 +00:00
Paul Cornett
89c6e02442 add wxEVT_MAXIMIZE support to wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 17:22:43 +00:00
Vadim Zeitlin
9bfdedfb3e Make brush hatches in wxGTK consistent with wxMSW.
The cross, vertically and horizontally hatched brushes used 4 pixels between
the hatches in wxGTK but 7 in wxMSW which was very noticeable. Use the same
pattern in wxGTK as MSW uses (as we can't change it there anyhow).

Closes #13029.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 16:35:56 +00:00
Vadim Zeitlin
65303ed7eb Correct the name of the header for GTK+ < 2.14.
Remove the extra ".h" suffix added during recent GTK+ 3-related changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 16:35:51 +00:00
Vadim Zeitlin
1910265f82 Add tests of other hatched brushes to the drawing sample.
Test wxCROSS_HATCH, wxVERTICAL_HATCH and wxHORIZONTAL_HATCH brushes and not
only the wxCROSSDIAG_HATCH one.

See #13029.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 16:35:46 +00:00
Vadim Zeitlin
8fa11bb2a2 Don't pop up annoying message box in the drawing sample.
The rubber banding selection message box was shown even after a simple click,
i.e. when nothing was actually selected which was quite annoying, so don't do
this.

Also remove unnecessary casts and use wxLogMessage() instead of
wxString::Printf() + wxMessageBox().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 16:35:43 +00:00
Vadim Zeitlin
621d922ffd Corrections to wxTextCtrl::HitTest() documentation.
Fix the signature of the overload returning row and column which got corrupted
during transition to Doxygen and document the overload returning the position
as well. Also document all the parameters.

Closes #12954.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 10:07:58 +00:00
Vadim Zeitlin
99f44d9704 Send wxEVT_COMMAND_DATAVIEW_CACHE_HINT to proper window.
The event was sent to wxDataViewCtrl parent instead of the control itself for
some reason, fix this.

Closes #13020.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 09:44:03 +00:00
Vadim Zeitlin
e22e5ee4e7 Mention that wxEVT_MAXIMIZE is only generated by a few ports.
Currently only wxMSW, wxOSX/Cocoa and wxOS2 generate this event. Notably wxGTK
does not.

See #13022.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 09:40:08 +00:00
Vadim Zeitlin
042959df5d Correct EVT_MAXIMIZE macro name in wxTLW documentation.
EVT_ACTIVATE was mistakenly used instead.

See #13022.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 09:40:04 +00:00
Vadim Zeitlin
ba7bc4e4e6 Fix search for item by text in wxMSW wxListCtrl.
LVN_ODFINDITEM handler could enter infinite loop if its selection was 0 and a
key not matching any of the items first letters was pressed.

Rewrite the loop in a simpler form to ensure that it is correct. Also clarify
some comments. Finally, fix the behaviour when no matching item was found (if
it didn't hang in infinite loop, it used to select the first item in the
control).

Closes #13026.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 09:28:41 +00:00
Vadim Zeitlin
aab1681669 Don't assert if starting search position in LVN_ODFINDITEM is invalid.
Just use wxLogDebug() if this happens, asserting here is not the right thing
to do as it doesn't indicate an error in the program but rather invalid
external input and, moreover, we can recover from it easily.

No changes in behaviour in normal case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-09 09:28:34 +00:00
Vadim Zeitlin
f382836f40 Add another missing #if wxUSE_MARKUP check.
The definition of DoSetLabelMarkup() should only be compiled when
wxUSE_MARKUP==1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-08 17:22:15 +00:00
Vadim Zeitlin
ff65c0ef06 Czech translation update from Zbynek Schwarz.
Fix some incorrect terms.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-08 17:22:08 +00:00
Stefan Csomor
74518cea41 support app activated and deactivated events, also bring back float_on_parent windows to normal level on deactivate to avoid behaving like stay_on_top
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-07 20:26:40 +00:00
Stefan Csomor
9d243a476a window level support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-07 19:04:55 +00:00
Stefan Csomor
e9e8b38179 bracket unused function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-07 17:31:19 +00:00
Jaakko Salli
52a368fed1 To prevent wxPropertyGrid from stealing frocus from other controls, only let SetFocusOnCanvas() move focus to the main grid 'canvas' if focus was already in on the grid's child controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-07 13:02:33 +00:00
Václav Slavík
ca9e521481 gtk/gtkunixprint.h only exists since GTK+ 2.14.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-07 12:07:58 +00:00
Václav Slavík
adc620811a Don't directly include GTK+ semi-public headers.
Only the main headers (e.g. gtk/gtk.h) should be included and GTK+ 3 is strict about this. Enable compile-time checks for this that work with GTK+ 2.24.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-06 18:22:28 +00:00
Václav Slavík
14b44999eb Include gdk/gdkkeysyms-compat.h.
GTK+ 2.22 changed GDK_* keysym constants to GDK_KEY_* and introduced a new header for the old names. This header must be explicitly included in GTK+ 3, so do it for now. In the long run, we should migrate to the new names.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-06 18:22:23 +00:00
Stefan Csomor
7dbda71e4b use FixedToFloat everywhere to make sure we don't round too early, preserve fractional width with CoreText as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-06 15:27:44 +00:00
Stefan Csomor
e418552365 position buttons to the right on OSX as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-06 15:24:26 +00:00
Stefan Csomor
b64af07b7c fix positioning bug with window disabler and hidden windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-06 14:49:19 +00:00
Julian Smart
0e190fa2b4 Fixed #13017: wxRichTextCtrl CopyToClipboard regression
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-06 09:09:42 +00:00
Stefan Csomor
902ddbfd3e support wxWindowDisabler on osx_cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-05 12:21:20 +00:00
Vadim Zeitlin
dc90b8d411 Add a dependency of wxUSE_TASKBARICON on wxUSE_MENUS.
PopupMenu() method of wxTaskBarIcon doesn't make much sense without wxMenu.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-05 11:16:55 +00:00
Vadim Zeitlin
77ba3f9326 Don't initialize wxGBSpan with invalid values in wxGBSizerItem.
Default wxGBSizerItem ctor initialized wxGBSpan with invalid values which
resulted in an assert when loading wxGBSizer from XRC since r66964.

Fix this by simply using the default wxGBSpan ctor instead.

Closes #13004.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-05 11:16:51 +00:00
Paul Cornett
b586d4c7e3 fix Activate signature after r67099
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-03 17:51:52 +00:00
Stefan Csomor
9159a25799 proper focus lost for multiline textfields and having all demanding a focusrect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 21:17:43 +00:00
Stefan Csomor
d5bda0b2bd the wx part knows better whether it has the focus (may be the embedded NSView, not the m_peer)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 21:16:30 +00:00
Julian Smart
52112306b0 Fixed a problem with paste resetting the content paragraph style.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 20:55:39 +00:00
Stefan Csomor
8c0e92cd9d move accel handling in front of the normal keyDown handling, support non-command menu accels
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 16:23:57 +00:00
Stefan Csomor
ba950d4418 move accel handling in front of the normal keyDown handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 16:21:24 +00:00
Stefan Csomor
9c89493228 supporting more key equivalents for display, fixing setHidden: method warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 15:43:42 +00:00
Stefan Csomor
07776bef5f removing code that will not have to be updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 15:42:45 +00:00
Vadim Zeitlin
8ec4c7a18d Japanese translations update from Suzumizaki-Kimitaka.
Closes #11773.

Closes #13003.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 10:28:25 +00:00
Vadim Zeitlin
85c8e8f80f Fix typo in wxStack<T> documentation.
I somehow managed to misspell wxStack<T> as wxSort<>.

Closes #13002.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 10:28:20 +00:00
Vadim Zeitlin
6a219e34a0 Add missing wxUSE_MARKUP checks in wxOSX code.
Don't define wxWidgetImpl::SetLabelMarkup() when wxUSE_MARKUP is off and
definitely don't reimplement it in wxButtonCocoaImpl as this code doesn't
compile without markup support.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-02 10:15:35 +00:00
Dimitri Schoolwerth
8529b0b909 Improved palette handling with saving PNG files.
Instead of converting alpha to a mask an attempt is made to write a palettised PNG file with an ARGB palette using a maximum of 256 transparency values where formerly just up to one was supported. GIF images with 256 colours and transparency can now also be saved as a palettised PNG instead of true colour, making the image a lot smaller.

Applied (modified) patch by troelsk. Closes #12850.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-01 21:29:17 +00:00
Václav Slavík
548fa9c1eb Pass wxRect/wxPoint arguments to wxDataViewCustomRenderer by reference.
Instead of passing them by value, use const reference. This change
is safe to do, because these methods' signatures were different in 2.8
anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-01 12:16:49 +00:00
Václav Slavík
43ff861df4 Fixed typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-01 12:16:45 +00:00
Václav Slavík
d2425a43ec Toggle checkboxes in generic wxDataViewCtrl with single click.
Both GTK+ and OS X native controls use single click to toggle
checkboxes, instead of double-click activation used by the generic
version. So does wxCheckListBox on Windows, so make wxDVC
behave the same way.

See #11185.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 21:23:10 +00:00
Václav Slavík
dbc3aec19a Get rid of WXGetAsCustom().
Instead, have WXOnActivate() and WXOnLeftClick() with same signatures as
their public API counterparts and just call Activate/LeftClick() from
them for wxDataViewCustomRenderer.

This accomplishes the same thing, but makes it easier to override
behaviour in wx's internal implementations of renderers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 21:23:04 +00:00
Václav Slavík
1852bf0db5 wxDataViewCtrl: Fully prepare renderer for Activate() call.
Instead of just setting the value in the generic implementation, do full
preparation (incl. attributes etc.) as everywhere else.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 21:23:00 +00:00
Stefan Csomor
e878c3477b adding hour constant to carbon build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 19:46:29 +00:00
Stefan Csomor
127668fcdd fixing non-precomp headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 19:29:15 +00:00
Stefan Csomor
3ac8892150 disable cursorRects for global busy state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 14:47:32 +00:00
Stefan Csomor
201c6db3e4 avoid setting live cursor during busy state
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 14:39:37 +00:00
Stefan Csomor
4c00ce28bd add watch cursor to osx_cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 13:44:25 +00:00
Stefan Csomor
b895498c75 don't swallow command events that are not handled by accels, fixes #12373
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 12:14:15 +00:00
Stefan Csomor
b59cd6c433 adding taskbar implementation for statusitem (menubar) and dock, fixes #12838
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 10:12:06 +00:00
Stefan Csomor
a5d0c88a85 moving appdelegate declaration to header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 10:10:08 +00:00
Stefan Csomor
733fa5907d make sure the quit item is only shown where appropriate on osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 10:07:00 +00:00
Stefan Csomor
a96f3e138b osx_cocoa supports both kind of taskbaricons in the menubar (standard) and as function of the dock (type DOCK)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-28 09:26:55 +00:00
Stefan Csomor
671b125ba7 make sure 10.4 command-key events are routed via the wx-accelerator route as well, fixes #12373
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 20:38:40 +00:00
Vadim Zeitlin
d44bc7333a Use single quotes in wxMarkupText unit test to work around VC6 bug.
VC6 seems to have a strange bug with escaped quotes used in strings passed to
macros and failed to compile the original code with nonsensical error messages.

Use single quotes to try to work around this issue. They are also somewhat
more readable as they don't need to be escaped inside C strings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 18:36:55 +00:00
Vadim Zeitlin
036718302c Add a trivial virtual dtor to wxMarkupParserOutput.
This class isn't really supposed to be used polymorphically but add a virtual
dtor just to suppress g++ warning about it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 18:36:52 +00:00
Vadim Zeitlin
6f83d108e9 Another fix for PCH-less build in markup code.
Include wx/control.h to use wxControl::RemoveMnemonics() and
FindAccelInIndex().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 18:36:48 +00:00
Dimitri Schoolwerth
87c7345cd0 Fixed drawing glitch with vertical MSW toolbars.
In case of a certain amount of whitespace at the bottom of a vertical toolbar it would not be drawn correctly: the more whitespace the more painting would be clipped starting from the left (covering the whole height of the toolbar) until the toolbar would look completely empty.

This was reproducible using the toolbar sample, setting the toolbar on the left or right edge of the window and then increasing the height of the window sufficiently.

Regression since r62971.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 15:09:13 +00:00
Vadim Zeitlin
c21a9bda7a Replace template function with template class to placate VC6.
VC6 has very poor support for template functions and in particular doesn't
understand explicitly choosing the type of the function to call so replace
template DoApplyToFont() function with FontModifier template class in
wxMarkupParserAttrOutput implementation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 14:01:36 +00:00
Vadim Zeitlin
1a6e6d5475 Fix for PCH-less build in markup code.
Include wx/log.h to use wxLogDebug().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 13:17:41 +00:00
Vadim Zeitlin
7d5051cb87 Update markup support documentation.
Mention that wxButton and wxStaticText now support markup in all major ports
(using the generic version of the latter under MSW).

Also mention markup changes in the change log.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:54 +00:00
Vadim Zeitlin
f672c96951 Add markup support to wxOSX/Cocoa wxStaticText and wxButton.
Add wxMarkupToAttrString helper that converts wx markup to OS X attribute
strings and use it in wxStaticText and wxButton.

This required adding new SetLabelMarkup() method to wxWidgetCocoaImpl, it
seems to make sense to have it there as it could be implemented by more
controls in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:46 +00:00
Vadim Zeitlin
83586c2aae No real changes, just make wxColour::OSXGetNSColor() const.
There is no reason to not allow calling this method on const wxColour objects.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:42 +00:00
Vadim Zeitlin
2814e718ba Add markup support to generic wxStaticText implementation.
wxMarkupText allows to easily support markup in the controls that we draw
ourselves so use it in wxGenericStaticText to have a possibility to use
markup on all platforms, even those where there is no native markup support in
wxStaticText itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:38 +00:00
Vadim Zeitlin
de1cc37868 Implement support for markup labels for wxGTK wxButton.
Simply directly set the markup for the GtkLabel used by GtkButton internally.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:30 +00:00
Vadim Zeitlin
95912bddde Add markup support to wxMSW wxButton and show it in the sample.
Use recently added wxMarkupText to implement support for markup in wxMSW
wxButton.

Update the button page of the widgets sample to show markup support.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:26 +00:00
Vadim Zeitlin
c27126c7bc Add generic wxMarkupText class implementing handling of markup.
wxMarkupText is a private class that implements generic handling of markup
strings, i.e. can measure them and render them onto a wxDC.

This class will be used for markup support in wxMSW wxButton.

Also add wxMarkupParserAttrOutput which will be useful for other wxMarkupText
implementations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:21 +00:00
Vadim Zeitlin
e29bf4b056 Add wxDC::GetFontMetrics() and implement it for wxMSW.
Add a new wxDC method allowing to retrieve the font characteristics not
available from GetTextExtent(), notably the internal leading (and also the
average font width).

Currently this is implemented for wxMSW only, the internal leading is always 0
in the other ports.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:13 +00:00
Vadim Zeitlin
f5bdfc69a5 Add wxUSE_MARKUP and wrap SetLabelMarkup() in it.
Make it possible to disable all the new markup-related code by setting
wxUSE_MARKUP to 0 in setup.h or using configure --disable-markup option.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:07 +00:00
Vadim Zeitlin
b55bc1a2ca No changes, just add a couple of #if wxUSE_COMMANDLINKBUTTON tests.
Don't even declare m_chkCommandLink if we have no support for command link
buttons in the library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:59 +00:00
Vadim Zeitlin
5fd67293ff Draw the underline 1 pixel higher in wxDC::DrawLabel().
Adjust the height of the underline to be compatible with native MSW behaviour.

Notice that in wxGTK we should use pango_font_metrics_get_underline_position()
to get the font-dependent value that should be used here.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:55 +00:00
Vadim Zeitlin
46e3b70f20 Restore height tweaking in wxMSWButton::GetFittingSize().
The change of r66893 was wrong, we do need to adjust the button height here
because the increase to standard height is not enough if we use bigger fonts
that require making taller buttons.

The real problem was the use of EDIT_HEIGHT_FROM_CHAR_HEIGHT() which added too
much to the height, so replace it with something based on the actual font
height. This is still arbitrary but slightly better.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:48 +00:00
Vadim Zeitlin
98977bf454 Initialize wxButton::m_authNeeded in ctor and not Create() in wxMSW.
Ensure that the member is always initialized as calling GetAuthNeeded() for a
default-constructed button would access a non-initialized variable before.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:43 +00:00
Vadim Zeitlin
6af59fe7f4 No changes, just do wxButton fields initialization in Init() in wxMSW.
Add a helper function called from ctors and initialize m_imageData in it
instead of doing it in each ctor -- this will be more important when we add
more wxButton members.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:36 +00:00
Vadim Zeitlin
3b5651af39 No changes, just move wxMSW wxButton::MakeOwnerDrawn() around.
Put this method in the existing private section at the end of the class
instead of having an extra access specifier just for it for some reason.

Also add a comment explaining what it does and when is it used.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:31 +00:00
Vadim Zeitlin
3da9cffc79 Replace wxST_MARKUP style with wxControl::SetLabelMarkup().
This is an incompatible change which removes the wxStaticText-specific
wxST_MARKUP style and adds wxControl::SetLabelMarkup() replacing it.

It doesn't actually change anything yet but it simplifies wxStaticText code a
lot by getting rid of many markup-related functions in it which had to behave
differently depending on whether wxST_MARKUP was used or not and also paves
way for adding markup support for the other controls in the future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:26 +00:00
Vadim Zeitlin
6ea2bc50c8 Don't call base class SetLabel() from GTKSetLabelForLabel().
Calling wxControlBase::SetLabel() only from GTKSetLabelForLabel() made its
behaviour inconsistent with GTKSetLabelWithMarkupForLabel() and also was
redundant in all but two places from which it was called, so remove this call
from this function itself and instead add it to its callers where it's really
needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:15 +00:00
Vadim Zeitlin
f27d4060df Remove unnecessary use of RemoveMarkup() in wxMSW wxHyperlinkCtrl.
Only the ampersands need to be escaped when setting the text of a native hyper
link control in MSW and this is done by wxControl::EscapeMnemonics(), not by
wxStaticText::RemoveMarkup() which also removes any tags which is not wanted
at all here.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:11 +00:00
Vadim Zeitlin
19da7aaa9b Add wxFont::SetSymbolicSize() and SetSymbolicSizeRelativeTo().
These methods allow to set the font size using CSS-like absolute size
specifications.

Notice that the factors used here are incompatible with (but better than) the
ones used in wxBuildFontSizes() in src/html/winpars.cpp. In the future it
would be nice to reuse the new wxFont functions in wxHTML code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:47:05 +00:00
Vadim Zeitlin
801423ee34 Add wxFont::Underlined() and MakeUnderlined() methods.
Add two more helpers for consistency with the existing methods such as Bold()
and MakeBold().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:46:59 +00:00
Vadim Zeitlin
0d0fdaacf8 Use wxMarkupParser in wxStaticText for dealing with markup.
No real changes, just remove markup parsing code from wxStaticText
implementation and reuse wxMarkupParser methods there instead.

This makes include/wx/private/stattext.h file unnecessary as it is used only
in a single place now so remove it and move its remaining contents to
src/gtk/mnemonics.cpp.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:46:55 +00:00
Vadim Zeitlin
5eb051a73b Add wxMarkupParser::Strip().
This helper function strips all markup tags from the string (and also decodes
the XML entities in it).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:46:48 +00:00
Vadim Zeitlin
9bb9964e26 Add a class for parsing simple markup.
This code is not used anywhere yet, this commit only adds the parser for the
markup and the related classes as well as the corresponding unit test.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:46:42 +00:00
Vadim Zeitlin
b1bf7dc722 Add a simple wxStack<> template class based on wxVector<>.
This is still simpler than std::stack<> which can be used with any container
and not just wxVector<> but better than the WX_DECLARE_STACK() macro which was
all that we had before.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:46:34 +00:00
Vadim Zeitlin
7067a74dd9 Disable NumValidatorTestCase::Interactive() for build bot slaves.
This test consistently fails on the MSW build slave machines (see e.g.
http://buildbot.tt-solutions.com/wx/builders/XPSP2 VC9 wxMSW trunk release/builds/2084/steps/test/logs/stdio)
for unknown reason so disable it for them. Notice that it does pass when ran
locally so it looks like another instance of a problem with wxUIActionSimulator
on these machines rather than the problem with the class itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:45:30 +00:00
Vadim Zeitlin
4bf152c5b4 Only use wxBU_EXACTFIT for width calculations in wxMSW wxButton.
wxBU_EXACTFIT should affect the width of the button best size but not its
height which should be at least the same as the height of a standard button
even when wxBU_EXACTFIT is specified, otherwise buttons created with it (like
the one in generic wxCollapsiblePane implementation) look completely ugly.

This commit restores the old behaviour which was recently changed by wxButton
sizing code simplifications.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:45:24 +00:00
Vadim Zeitlin
f87ddf1834 Specify correct size for disabled image list in wxMSW wxToolBar.
Use the real bitmap size instead of the default tool size when creating the
disabled image list as the actual bitmap size could be less than the default
one and in this case adding images to the image list later would fail (as
could be seen by using custom bitmaps in the toolbar sample).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:45:19 +00:00
Jaakko Salli
0429e043a8 Include image.h and check for wxUSE_IMAGE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 08:51:01 +00:00
Julian Smart
cc27bb0716 Applied #12985: Improved installation instructions for wxWidgets for Mac OS X Cocoa and Carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 08:13:56 +00:00
Vadim Zeitlin
f36ddde1ea Fix libraries order in screenshotgen bakefile.
The richtext library must come before the adv one as it depends on the classes
in the latter and with the old libraries order linking failed in static build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-26 17:51:34 +00:00
Vadim Zeitlin
d13dc522f4 Mention wxZlib classes in archives overview.
Closes #12974.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-26 17:46:57 +00:00
Vadim Zeitlin
af07be96eb Don't use wxTE_PROCESS_ENTER in wxSpinCtrlGeneric.
We don't need to catch Enter presses to generate spin control events as we do
it anyhow when we lose focus. So simply remove the Enter handling code
entirely (it could be used to generate wxEVT_COMMAND_TEXT_ENTER events but we
don't generate them nor wxEVT_COMMAND_TEXT_UPDATED at all currently in the
generic version).

Closes #12980.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-26 17:46:54 +00:00
Vadim Zeitlin
42a2d74bd0 Don't use wxTE_NOHIDESEL in wxSpinCtrlGeneric.
There is no reason to use this flag for the spin control and doing it makes it
gratuitously different from the native one under wxMSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-26 17:46:51 +00:00
Stefan Csomor
8591c94695 fixing support for true children of wxStaticBox with wxStaticBoxSizer under osx_cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-26 15:44:14 +00:00
Stefan Csomor
7a69cf792b making GetPosition 1:1 symmetrical to Move (respecting contentViews), fixing borderDrawing within NSBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-26 11:04:43 +00:00
Julian Smart
1437c7fba6 Fix for #11647: text from WriteText not scrolled to be visible in wxRichTextCtrl
IsPositionVisible was incorrect.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-25 17:28:27 +00:00
Jaakko Salli
28e27c3475 In wxPGProperty::SetValueImage(), use wxImage::Rescale() for scaling down the bitmap instead of wx(Memory)DC functions. Results should look much nicer and also retains alpha channel with much less effert.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-25 13:00:57 +00:00
Julian Smart
3a4a38c143 Applied patch in #12279: in wxRichTextCtrl, when wxRE_READONLY is set, the undo, redo function should be disabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-25 12:25:12 +00:00
Julian Smart
5701f8338e Applied #12601: Background color when saving wxRichText to HTML file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-25 12:21:56 +00:00
Julian Smart
706465df1f Applied #12941: Fixes and enhancements for wxRTC (Robert Hoffman)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-25 11:37:20 +00:00
Julian Smart
887b919bde Added wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT to fix tree and list control selection rendering.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-25 09:38:35 +00:00
Vadim Zeitlin
d70fe85f46 Handle ANSI release configuration correctly in msvc/wx/setup.h.
Preprocessor operations don't work with empty values so check for the case of
empty suffix specially.

This avoid warnings about "not enough actual parameters for macro
'wxSTRINGIZE_HELPER'" from MSVC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-24 20:34:48 +00:00
Vadim Zeitlin
3f0e574aa7 No changes, just fix a typo in the changelog.
s/futher/further/

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-24 20:34:45 +00:00
Stefan Csomor
10c0869605 reverting part of r58797, otherwise wxClientDC get no graphics context at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-24 14:56:40 +00:00
Vadim Zeitlin
2e7352635e Update and improve "Hello world" example in the documentation.
The example was corrupted by transition to Doxygen (the menu item labels got
eaten), fix it to actually work.

Also use this opportunity to improve and modernize it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-23 23:35:48 +00:00
Stefan Csomor
f18b5ee74c supporting content size scaling (retina display)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-22 18:51:10 +00:00
Stefan Csomor
455f62c3b5 building iphone again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-22 15:47:09 +00:00
Vadim Zeitlin
b83d3903e6 Update Czech translations.
Apply update from Zbynek Schwarz.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-22 13:55:56 +00:00
Vadim Zeitlin
6235846c0c Don't duplicate INVALID_FILE_ATTRIBUTES definition.
Move it in wx/msw/missing.h header instead of defining it in two different
places.

Closes #12964.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-22 13:26:06 +00:00
Vadim Zeitlin
6d2139e829 Test for cairo_push_group() in configure.
This function is required by wxGraphicsContext Cairo-based implementation but
is missing in old Cairo versions so check for it in configure and disable
wxGraphicsContext is it's not available.

Closes #12966.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-22 13:26:00 +00:00
Vadim Zeitlin
b8b9e48c51 Put storage class outside WXDLLIMPEXP_DATA_CORE() macros.
The storage class must come first in a declaration so put it in front of
WXDLLIMPEXP_DATA_CORE() and not inside it to avoid warnings from some
compilers (notably Intel one).

Closes #12932.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-22 13:25:51 +00:00
Vadim Zeitlin
58d424d7e1 Remove duplicated control names strings declarations from wxOSX.
There is no need to declare wxFooNameStr constants in wx/osx/foo.h files as
they are already declared in wx/foo.h.

Also remove a couple of header/forward declarations unnecessary for the same
reason.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-22 13:25:38 +00:00
Vadim Zeitlin
4add61fd8b Move wxCheckBoxNameStr declarations to wx/tglbtn.h from wx/port/tglbtn.h.
Don't duplicate wxCheckBoxNameStr declarations in all ports.

Of course, the question still remains why does wxToggleButton use
wxCheckBoxNameStr and not a specific name in the first place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-22 13:25:30 +00:00
Václav Slavík
9698902019 Put normal space between Back and Next buttons in wxWizard.
Use regular space between these two buttons even on Windows, where they
were previously close together. This used to be done in older Windows
versions, but modern Windows HIG documents show wizards with equal
spacing between all buttons and that's what Windows OS itself does. In
other words, not treating this pair of buttons specially is more native.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-20 18:18:51 +00:00
Julian Smart
fc5bebcef4 Corrected a hit test problem when tabs are present
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-20 12:05:13 +00:00
Stefan Csomor
89a5da7c75 handling nil images correctly, solves #12956
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-20 06:31:12 +00:00
Stefan Csomor
2daf63c4eb appeasing clang
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 16:18:55 +00:00
Stefan Csomor
91b85d9b0c only draw separator line on the area adjacent to content, avoids double frames
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 14:51:27 +00:00
Vadim Zeitlin
7889a3a9fc Remove unused variables in wxOSX code.
Simply remove some unused variables that Xcode 4 compiler warned about.

See #12927.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 14:17:03 +00:00
Vadim Zeitlin
dbbb040c9f Remove extra semicolons in Objective-C code.
The semicolons after the method signature in its implementation are useless
and, in fact, provoke warnings from the compiler used by Xcode 4. Simply
remove them.

See #12927.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 14:16:58 +00:00
Vadim Zeitlin
062aa562d0 Remove stray #pragma implementation.
This #pragma is obsolete and shouldn't be used any more (if it ever had to
be).

See #12927.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 14:16:52 +00:00
Vadim Zeitlin
ab544700d2 Remove long unused wxHTML files.
These files seem to be left overs from the initial cvs import many years ago,
remove them to avoid confusion.

See #12927.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 14:16:46 +00:00
Vadim Zeitlin
9204fde6ee Add wxT_2() macro for compatibility with wxWidgets 2 API.
This macro can be used to make the same code compile with both v2 and v3 as it
expands to wxT() in 2.8 and nothing in later versions.

See #12925.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 13:44:19 +00:00
Vadim Zeitlin
1244d2e07f Add wxAutomationInstance_SilentIfNone flag for wxMSW OLE code.
This flag allows to suppress the error message in case there are no currently
running instances of this object and can be useful if the caller doesn't know
in advance whether it's available or not.

Closes #12734.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 12:33:08 +00:00
Vadim Zeitlin
d65e9d5707 Move "static" keyword out from wxDEPRECATED() macros to placate icc.
Intel compiler gives warnings if the static keyword is not at the beginning of
the declaration and this happened when using it inside wxDEPRECATED() and
related macros because the declaration started with __declspec(deprecated) or
__attribute__((deprecated)) instead.

To avoid this problem, simply move "static" outside the macro.

Closes #12932.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 12:32:59 +00:00
Vadim Zeitlin
16c7d85b34 Correct signed/unsigned comparison in wxGridBagSizer code.
Casting a signed value to unsigned type is a recipe for disaster if it
actually turns out to be negative because the comparison remains always false
and the loop becomes practically infinite. So cast the unsigned value to
signed int instead, this should be perfectly safe as the number of columns or
rows in a sizer can't exceed INT_MAX anyhow.

Notice that after the changes of the previous revision the signed value
should actually be always positive so this change is not strictly needed but
it is still safer to write the comparison like this.

See #12934.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 12:32:53 +00:00
Vadim Zeitlin
1b3b63ed5b Don't accept invalid values for rows/columns in wxGBSpan ctor.
wxGBSpan must have strictly positive row and column span as otherwise the grid
bag sizer code could enter an infinite loop trying to exceed a negative number
which it casted to an unsigned one. And while the cast itself is incorrect too
the program still behaves undesirably (produces a lot of asserts in debug
build and then crashes or crashes directly in release) if a zero size span is
used so it seems better to prevent this from happening.

Closes #12934.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 12:32:48 +00:00
Vadim Zeitlin
359cde15e0 Fix out of bounds string access in wxMSW wxDirDialog.
Using the initial directory of "/" (or "\\" or in fact any string consisting
solely of slashes and backslashes) resulted in a crash as the code incorrectly
tried to read the character before the beginning of the string.

Fix this by checking that the string is not empty before using s.end()-1
iterator.

Closes #12946.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 00:30:32 +00:00
Vadim Zeitlin
ca746004af Don't ask for wxTextAttr colour if it doesn't have any in text sample.
This fixes an assert which could happen when showing the rich text editor.

Also show the colour in a more readable form if possible.

Closes #12950.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 00:30:24 +00:00
Vadim Zeitlin
2de611305e Compilation fix for PCH-less wxOSX build.
Forward declare wxChoice.

Closes #12953.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-19 00:30:18 +00:00
Stefan Csomor
eeb415ecbe fixes #12935
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-18 19:06:11 +00:00
Stefan Csomor
490315f9b4 bail out with error in case of carbon set for 64 bit architecture
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-18 18:44:43 +00:00
Stefan Csomor
fbede18c59 precomp header fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-18 18:25:23 +00:00
Stefan Csomor
a37e1f0e83 updating sysopt string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-18 17:48:39 +00:00
Stefan Csomor
13390af486 support for file-type popup, compatible for 10.4+, solves #12429
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-18 17:29:31 +00:00
Stefan Csomor
d814b237d9 support non precomp builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-18 07:26:15 +00:00
Julian Smart
e723991bb0 Fixed bug #9856: wxSizer::Replace( size_t, wxSizerItem *) doesn't call SetContainingSizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-17 09:53:06 +00:00
Stefan Csomor
e5ada8e1aa activating high-res support via artprov mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-17 09:46:27 +00:00
Stefan Csomor
8f5bce64e0 patch applied with thanks, fixes #10524
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-17 06:46:09 +00:00
Vadim Zeitlin
03c9cce564 Correct example of wxRegKey use in its documentation.
Don't check for the key existence, it ought to exist if we create it like
this.

Also don't allocate wxRegKey object on the heap unnecessarily.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 23:51:08 +00:00
Vadim Zeitlin
00a73a8de6 Remove WXDLLIMPEXP_CORE from VC6 wxCompositeWindow declaration.
Hopefully not using WXDLLIMPEXP_CORE here should fix VC6 warnings about using
non dll-interface class as a base class for a dll-interface one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 23:45:04 +00:00
Vadim Zeitlin
f4d084afda Don't use native MSW wxProgressDialog version in wxUniv.
The native version should only be used in the native port.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 23:45:00 +00:00
Vadim Zeitlin
0c3ae94cf0 Compile wxUIActionSimulator in wxUniv builds.
Move wxUIActionSimulator implementation files to low level sources to ensure
that they are included in wxUniv builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 23:44:55 +00:00
Stefan Csomor
b9c22bca90 adding edit menu in order to be able to support native edit menu commands (osx)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 18:51:15 +00:00
Stefan Csomor
fbbe829a19 support native edit menu handling (cocoa enables menu items in built-in modal dialogs automagically, if they have the proper selectors)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 18:32:31 +00:00
Stefan Csomor
f1f5ddd755 toolbar support in all orientations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 18:31:16 +00:00
Stefan Csomor
baac715443 toolbar support in all orientations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 18:30:55 +00:00
Stefan Csomor
ca9adee47f remove ununsed member
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 16:37:24 +00:00
Stefan Csomor
075386e6e7 conforming to deprecation recommendation for 10.6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 16:10:30 +00:00
Stefan Csomor
5411e35f7b support for file types in save panel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 07:38:48 +00:00
Stefan Csomor
fd5907ffd9 support wxFD_MULTIPLE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 06:59:53 +00:00
Stefan Csomor
2677566b1d fixing naming to conform to effective ownership, cleaning up releasing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 06:55:43 +00:00
Paul Cornett
192c3efa7f fix GCC warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-16 05:13:00 +00:00
Mattia Barbon
d20dfbf04b Fixed compilation when WXINTL_NO_GETTEXT_MACRO is defined.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-15 20:31:19 +00:00
Vadim Zeitlin
93d4df75cb Make the source file non-executable.
The file ctrlcmn.cpp somehow got the executable bit in r66871, undo this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-15 10:15:27 +00:00
Vadim Zeitlin
738764c0e6 Don't increase button height in wxMSWButton::GetFittingSize().
This is unnecessary and resulted in too high buttons in some cases for buttons
with images. As we increase the button height to at least the standard value
later in all code using function anyhow, it's not necessary to do anything
with the height inside it.

Now the buttons with an image get the same height whether they have the text
or not.

This change also gets rid of (completely arbitrary) decision to use 11/10 of
the label height when computing the fitting button size and it's always nice
to get rid of dirty hacks like this.

Closes #12924.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-14 22:12:16 +00:00
Vadim Zeitlin
1e43584aa7 Don't make buttons with images too wide in wxMSW.
We used to increase the button size to the standard size first and then add
the extra padding the buttons with images. This resulted in too much padding
for the buttons with short text labels and images.

Instead, add the padding for the image first and only then increase the button
size to the standard one if still needed.

See #12924.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-14 22:12:10 +00:00
Vadim Zeitlin
c3d652aeb9 Don't add margins for buttons with text and images by default in wxMSW.
For some reason wxXPButtonImageData added (big) margins around the button by
default resulting in too much padding. Simply remove these margins to make it
behave similarly to wxODButtonImageData.

See #12924.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-14 22:12:04 +00:00
Vadim Zeitlin
65034d07ed Clarify wxButton::AdjustForBitmapSize() semantics in wxMSW.
This method should only be called if we do have an image, assert (instead of
silently returning) if it's called when we don't.

Also explain in a comment why do we need to call CacheBestSize() only when we
have an image in DoGetBestSize().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-14 22:11:58 +00:00
Stefan Csomor
026e7dcba0 support framelayout for choice
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-14 19:13:04 +00:00
Vadim Zeitlin
31b81622d3 Remove X11-specific wxWindowIsVisible() from common Unix file.
XGetWindowAttributes() used in this function resulted in link problems under
Fedora 14 because we don't explicitly link with libX11. Instead of doing this,
simply get rid of this function as it seems to be used in exactly one place in
wxX11 code only anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-14 12:30:43 +00:00
Vadim Zeitlin
df7d641d63 Explain wxSizer::SetVirtualSizeHints() deprecation.
Tell people that FitInside() should be used instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-14 11:59:13 +00:00
Václav Slavík
cc118a9b0e Fix VC2008 dependencies with Bakefile 0.2.9.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-13 17:09:33 +00:00
Václav Slavík
9a49372428 More wxControl::Ellipsize() tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-09 19:52:50 +00:00
Václav Slavík
4b52555d71 Don't eliminate text completely in Ellipsize().
If the shortened text is so short there's nothing left of the original,
show one character and "...". This is standard behaviour on both
Windows and OS X, in addition to making lot of sense.

Fixes #11360.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-09 19:52:34 +00:00
Václav Slavík
38ddd614f2 Calculate ellipsized width exactly.
Width calculation using partial extents is just an inaccurate
estimate: partial extents have sub-pixel precision and are rounded
by GetPartialTextExtents(). Use partial extents to
estimate string width and only verify it with GetTextExtent()
when it looks good.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-09 19:52:22 +00:00
Václav Slavík
508fc76d0c Don't shorten text too much in wxControl::Ellipsize().
If the allowed width is so small that nothing reasonable can fit it,
overlap it. Ellipsized text must always contain "..." to indicate that
it was shortened, it isn't acceptable to omit it.

See #11360.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-09 19:52:10 +00:00
Václav Slavík
d6ebae9a94 Ellipsization can't shorten 1-character string.
It doesn't make sense to attempt to shorten 1 character long string, so
don't do it. Note that 2 characters strings may be shortened (consider
e.g. "mm" in some typefaces).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-09 19:51:58 +00:00
Václav Slavík
1d065710d3 Remove "safety margin" from wxControl::Ellipsize().
When ellipsizing kicks in, the text is much shorter than the available
space -- there's a "safety margin" of one character's width that is
always left unused. This appears to be some kludge that worked around
algorithm defects, not something that should really be needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-09 19:51:47 +00:00
Jaakko Salli
90fae9d2cf Added missing wxBitmapComboBox::Insert() implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-09 19:11:13 +00:00
Vadim Zeitlin
b083f3e8c1 Tweak offset in the RichTextCtrlTestCase::UrlEvent() to make it pass.
The mouse was not positioned over the URL in this test so clicking it didn't
work. Tweak the offset to make it pass but it would be better to have some
more fool-proof way of finding the real position of the text in the control.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-08 17:24:50 +00:00
Vadim Zeitlin
fb76ad8f55 Use wxLocale instead of setlocale() to change the locale in the tests.
Numeric validator tests rely on wxLocale::GetInfo() returning the decimal
point and calling setlocale() is not enough to ensure this under MSW, we must
use wxLocale for this currently.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-08 17:24:45 +00:00
Stefan Csomor
816b29417d disabling multiline text controls correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-08 14:19:20 +00:00
Stefan Csomor
6ade9e8917 forward enable functionality to inner view in scrollview (eg for multiline textviews)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-08 14:11:56 +00:00
Vadim Zeitlin
e4c903b2ea Fix wxWrapSizer minimal size calculation.
Add a unit test checking that wxWrapSizer::CalcMin() returns the expected
results.

Closes #12464.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-08 13:36:13 +00:00
Vadim Zeitlin
8de6a0270d Fix bytes to integers conversion in png2c script.
Use really correct coefficients for all the bytes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-08 13:36:06 +00:00
Vadim Zeitlin
21b5902b81 Define KEY_WOW64_64KEY if it is missing from SDK headers.
Fixes compilation with old SDKs, e.g. the one used by VC6.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-08 13:36:01 +00:00
Stefan Csomor
aa3e374197 copy item text for app menu items from wx menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-08 10:47:19 +00:00
Vadim Zeitlin
31a9fc9390 Correct more wxEVT_AUXn_XXX event types names.
This completes the changes of r64414 and also removes the extraneous "MOUSE"
from the event types listed in the wxMouseEvent ctor documentation.

Closes #12095.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-06 01:01:14 +00:00
Vadim Zeitlin
302674fe17 Use better title by default in wxDocPrintout.
Use the document name instead of the default "Printout" if no title is
explicitly specified when creating wxDocPrintout.

Closes #12885.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-06 01:01:09 +00:00
Vadim Zeitlin
a5c468483d Allow accessing 64 bit registry from 32 bit MSW code and vice versa.
Implement support for KEY_WOW64_32KEY and KEY_WOW64_64KEY in wxRegKey code.

Closes #10792.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-06 01:01:01 +00:00
Vadim Zeitlin
e615d356fc Use Explorer style for wxTreeCtrl with wxTR_TWIST_BUTTONS in wxMSW.
The tree control style used by Explorer uses rotating triangles instead of the
standard "+/-" buttons and so seems to correspond relatively well to this
style. And this provides a possibility to have a more standard-looking tree
controls in wxWidgets programs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-06 01:00:48 +00:00
Vadim Zeitlin
1f77d487b7 Clean up wxMSW wxTreeCtrl code by removing obsolete workarounds.
Remove wxUSE_COMCTL32_SAFELY that hasn't been needed for years, the current
code seems to work just fine on all the systems so remove this obsolete
workaround to simplify it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-06 01:00:40 +00:00
Vadim Zeitlin
57c7447463 Link console programs with PNG library in monolithic build.
PNG images are used by the main wxWidgets library itself now and so linking
with the monolithic wx library introduces dependencies on PNG as well, even
for the console applications. Link them with linpng to avoid linker errors.

Closes #12889.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-05 20:25:09 +00:00
Vadim Zeitlin
a8bda51207 Correct decoding of 4-byte integers in png2c script.
Wrong multiplier was used for the most significant byte. Fix it even though it
doesn't risk to be a problem in practice as the images of such gigantic size
would surely break some limit anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-05 20:24:52 +00:00
Vadim Zeitlin
7721116699 Re-enable generation of wxEVT_MOVE_{START,END} events under wxMSW.
Handling of WM_{ENTER,EXIT}SIZEMOVE was disabled as a side-effect of r47927,
possibly unintentionally. Revert this change to generate these events again.

Also document that they're MSW-only for now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-05 20:24:47 +00:00
Vadim Zeitlin
41628a43cb Don't adjust menu item positions for title for menubar menus in wxMSW.
The code in wxMSW menu code which accounted for the extra items used to show
popup menu title has become incorrect since the changes of r66178 as now the
non-popup menus have titles as well.

Correct the check to only do the adjustment for the popup menus.

Closes #12922.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-05 16:38:53 +00:00
Vadim Zeitlin
0a12e013f5 Deprecate second parameter of wxSlider::SetTickFreq().
This parameter was never needed nor properly documented. Simply remove it from
SetTickFreq() and keep the overload still taking it for backwards
compatibility only.

Closes #12907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-05 16:36:30 +00:00
Vadim Zeitlin
c20389eb5f Implement restoring default video mode under OS X.
Use CGRestorePermanentDisplayConfiguration() to implement switching to default
video mode in wxOSX wxDisplay implementation.

Closes #12914.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-05 16:36:18 +00:00
Vadim Zeitlin
55dffc4f13 Check for WLAN interface names in wxDialUpManager under Unix.
Recognize "wlan" and "ath" interfaces as well as the "eth" ones.

Closes 12923.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-05 16:14:24 +00:00
Julian Smart
8757ab3623 Fix for lines not wrapping soon enough if tabs are present
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-03 20:05:33 +00:00
Vadim Zeitlin
00eef16d51 Rebake everything using bakefile 0.2.9.
Update configure and bakefile.m4 for the new version too.

Also add the missing makefiles and projects for the XTI sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-03 15:02:45 +00:00
Jouk Jansen
23fd114fcd Avoid incompatible operand types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-03 10:59:50 +00:00
Stefan Csomor
cc5fe8d459 fixes #10978
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-03 10:20:01 +00:00
Stefan Csomor
f67a33e3ad switching to assert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-02 13:49:44 +00:00
Dimitri Schoolwerth
15f345aad3 Added support for reading comments from a GIF image.
Applied (modified) patch by troelsk. Changed comments (which are allowed per frame in an animated GIF) to be read using wxIMAGE_OPTION_GIF_COMMENT with wxImage.GetOption. Added unit tests for reading and writing GIF comments.

Closes #12843.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-02 11:19:30 +00:00
Stefan Csomor
41857332b6 testing for define alone is sufficient and more portable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-02 07:56:38 +00:00
Stefan Csomor
11f87a381b fixing searchctrl on osx_cocoa, changing type for peer to wxSearchCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-02 07:55:57 +00:00
Stefan Csomor
2f250cb6e6 guard against null ptr access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-02 07:36:18 +00:00
Václav Slavík
4d3de2c5f7 Account for first removal char with wxELLIPSIZE_MIDDLE.
wxControl::Ellipsize() in wxELLIPSIZE_MIDDLE mode starts the
string-shortening loop with the removal interval initially set to remove
only the len/2-th character. But it didn't add its size to the running
total of removal characters' length, thus always removing one more
character. Fixed by making the initial interval 0-sized rather than
1-sized.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-31 18:23:32 +00:00
Václav Slavík
3433de6e63 Remove chars one-by-one with wxELLIPSIZE_MIDDLE.
Previously, Ellipsize() would always remove two characters at a time in
wxELLIPSIZE_MIDDLE mode. This was clearly a bug: it led to shortening
the text more than was strictly necessary.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-31 18:23:29 +00:00
Václav Slavík
3999336cb9 Fix vertical rules rendering in generic wxDataViewCtrl.
Vertical rules are now drawn in the last pixel of a column instead of in
the first, so that they align perfectly with native MSW wxHeaderCtrl as
well as for consistency with MSW native list control.  There's no
vertical rule at the most-left side of the control anymore.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-31 16:54:03 +00:00
Stefan Csomor
ec46fd5fce adding support for wxCANCEL_DEFAULT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-30 19:01:37 +00:00
Vadim Zeitlin
85ecb1d5ca OLE uses VARIANT_TRUE and not TRUE for its boolean values.
VARIANT_TRUE is -1, unlike TRUE which is just 1, and we must use the former
and not the latter with OLE VARIANT values.

Closes #12910.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-29 14:20:42 +00:00
Vadim Zeitlin
ff4713940d Revert "Set up pages range in the wxMSW print dialog correctly."
This patch changed the relative order of calls to wxPrintout::GetPageInfo()
and OnPreparePrinting(), breaking the existing code and the documentation
promise about OnPreparePrinting() being called first, so revert it.

Reverts r66549.
See #12819.
Closes #12911.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-29 13:55:40 +00:00
Jouk Jansen
aadabb545b Update OpenVMS makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-28 15:01:01 +00:00
Dimitri Schoolwerth
64a3ee76aa Allow writing a comment to each GIF frame.
Don't write a comment as part of the GIF header during the first frame only but write a possible comment for each wxImage in an animation.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-28 08:36:34 +00:00
Dimitri Schoolwerth
da60600bc9 Added support for writing a long comment to a GIF image.
Instead of limiting a comment to a maximum length of 255 bytes write multiple comment data blocks (each a Pascal string) followed by the block terminator.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-28 08:10:01 +00:00
Stefan Csomor
7279a306bb clang fix, fixes #12332
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-28 07:35:07 +00:00
Dimitri Schoolwerth
491da41173 Changed the procedure for writing a comment to a GIF image.
Use wxImage.SetOption with newly introduced wxIMAGE_OPTION_GIF_COMMENT to set a GIF's image comment now. Formerly this was done (since recently) using wxGIFHandler::ms_comment which has now been removed.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-28 07:27:34 +00:00
Paul Cornett
d4280c0282 better way to silence unused parameter warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-28 06:18:33 +00:00
Bryan Petty
be4980ab43 Properly account for floated panes while restoring maximized pane.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-28 02:21:42 +00:00
Stefan Csomor
db2c04684d clang fixes, fixes #12332
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 18:35:01 +00:00
Stefan Csomor
f5f3d4ec5c clang fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 17:15:40 +00:00
Vadim Zeitlin
5adab48272 Document wxEVT_COMMAND_SPINCTRL_UPDATED in EVT_SPINCTRL description.
Also mention the name of the event type when documenting the corresponding
event table macro.

Closes #12897.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 13:27:14 +00:00
Vadim Zeitlin
25fae92323 Fix link errors under Cygwin with wxUSE_GRAPHICS_CONTEXT==1.
Define ourselves _GdipStringFormatCachedGenericTypographic variable referenced
by Cygwin GDI+ headers to fix linking errors due to the fact that we don't
link with gdiplus.lib at all but load gdiplus.dll dynamically.

Closes #11716.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 13:27:09 +00:00
Stefan Csomor
4ba6d656c3 __BIG_ENDIAN__ is either defined AND has a value of 1, or it is not defined at all, so #ifdef is sufficient
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 13:00:16 +00:00
Stefan Csomor
afc67820ef fixing return type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 12:38:24 +00:00
Stefan Csomor
d67faa04d4 clang warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 11:54:19 +00:00
Stefan Csomor
4bc3adadc1 good catch by clang ...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 11:53:51 +00:00
Stefan Csomor
d5923e449d clang warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 11:37:37 +00:00
Stefan Csomor
8a3ddc6bd5 reverting inadvertent commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 11:04:45 +00:00
Stefan Csomor
df04f800b8 supporting clang 2.0 under xcode, see #12332
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-27 11:00:26 +00:00
Stefan Csomor
6c894d4e65 keeping opaqueness and backgroundcolor in synch with bgstyle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 18:49:02 +00:00
Stefan Csomor
ca12c122df per default wx' static text items have a transparent background
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 18:46:59 +00:00
Stefan Csomor
ca9eebc346 artmac extended for cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 16:15:39 +00:00
Stefan Csomor
516e9d1335 fixing toplevel position
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 15:55:20 +00:00
Stefan Csomor
1cea736e03 hinting support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 15:54:03 +00:00
Stefan Csomor
7f37eded21 PNG is the native format on iOS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 15:53:31 +00:00
Stefan Csomor
809d69287e avoid populating the array with NULL controls during creation (SetWindowVariant calling SetFont crashing)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 15:52:41 +00:00
Stefan Csomor
99eb484a70 support for hints, fixing textfield implementation on iOS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 15:51:39 +00:00
Stefan Csomor
01470e3741 Maximize for iPhone
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-26 07:42:33 +00:00
Stefan Csomor
554b2800c6 supporting a null cgimage so that we don't get exceptions, only an wxbitmap that is !Ok()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-25 18:47:12 +00:00
Stefan Csomor
5769f801b4 support for separator (fixed width spacE)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-25 18:46:01 +00:00
Stefan Csomor
bf7470fe14 adding constructor from CGImageRef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-25 15:47:05 +00:00
Dimitri Schoolwerth
fdfedfc077 Fixed heap corruption when reading a corrupted RLE TGA image.
There were no boundary checks in place to verify an indicated repeat of pixels would still be inside the image's data. Added these checks and a unit test making sure these kind of TGAs now fail to load.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-25 11:23:42 +00:00
Dimitri Schoolwerth
e02edc0e6e Fixed typo in wxFileName::GetHumanReadableSize docs.
Closes #12898.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-25 08:15:55 +00:00
Robin Dunn
06f28e5572 Save the mode in SetMode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-25 05:14:30 +00:00
Robin Dunn
5cef2f6505 Add wxRTTI macros for the wxSimpleHtmlListBox class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-25 05:03:17 +00:00
Paul Cornett
c742231d29 remove deprecated voidp, closes #12896
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-24 17:36:44 +00:00
Stefan Csomor
aa642a456c fixing toolbar repositioning (iOS)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-24 16:45:58 +00:00
Stefan Csomor
3fdfbc9ca1 guarding code in case of delayed controller release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-24 16:45:25 +00:00
Václav Slavík
1acf670a9d Don't allow user to resize non-resizable columns to best size.
Double-clicking columns separator resizes the column to the best width
for its content. This should only be done for resizeable columns,
though.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-24 14:35:33 +00:00
Václav Slavík
c6b223ca49 Remove incorrect comment.
UpdateColumnWidthToFit() is in fact used when double-clicking columns separators.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-24 14:35:30 +00:00
Stefan Csomor
4cf611db97 direct constructor from CGImageRef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-24 13:17:59 +00:00
Jaakko Salli
07ca69f692 To work around harmless memory leaks reported by Visual C++ static runtime libs, assume that C++ typeid operator works well with VC++ 9.0 and later (fixes #12023)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-23 10:13:49 +00:00
Stefan Csomor
aaa7d63c51 loading png and jpg from resource bundle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-23 10:10:45 +00:00
Julian Smart
a134e2677a Reverted for a quiet life
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-22 21:25:13 +00:00
Julian Smart
5fc6acb389 Don't pointlessly forbid calling AddGrowableRow/Col before adding items.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-22 20:43:55 +00:00
Václav Slavík
3d825e0613 wxDataViewCtrl: fix autosized columns recalculation.
The code and its assumptions were correct only for generic wxHeaderCtrl,
it didn't work for MSW implementation. Fixed by updating all columns
every time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-22 19:02:02 +00:00
Dimitri Schoolwerth
6636ef8ddf Use wxString's empty() when checking if the string is (non-)empty throughout wx.
Instead of constructs such as if "( s.length() )" and "if (s.length() > 0)" use "if ( !s.empty() )" instead. Similarly for "if (s.length() == 0)" or "if ( s.IsNull() )", use "if ( s.empty() )".
No code changes intended except for a few instances where a construct like "if ( s.length() && wxFileExists(s) )" was changed to not check the length of the string and let wxFileExists handle such cases.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-22 14:38:36 +00:00
Vadim Zeitlin
c9ed413ab4 Explicitly set "C" locale for the tests using decimal point.
Ensure that the tests expecting the results with a point as decimal separator
really are done in C locale.

This should help the tests pass in (French) locale used by the MSW build bot
slaves.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-20 15:06:17 +00:00
Vadim Zeitlin
d8d9844b29 Further improve caching of locale-specific data in wxNumberFormatter.
Also update the cached data if setlocale() was called explicitly instead of
using wxLocale to change the locale because at least under Unix systems
calling setlocale() changes the result of wxLocale::GetInfo() and so the
result returned by wxNumberFormatter::GetDecimalSeparator() and
GetThousandsSeparatorIfUsed() could be inconsistent with the locale being
really used.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-20 15:06:09 +00:00
Julian Smart
343ef639a9 Fixed some bugs in up/down cursor navigation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-20 15:02:19 +00:00
Stefan Csomor
4472e2b6b7 using explicit fixes #12689
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-20 08:38:36 +00:00
Vadim Zeitlin
a7d696f13d Include more information in assert in wxNumberFormatter.
Show more information in the assert failure message to try to understand why
is the unit test failing on the buildbot.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 23:47:16 +00:00
Vadim Zeitlin
6496afbab8 Work around wxNumValidator compilation problems with MSVC 6.
Surprisingly, MSVC 6 seems to be able to compile most of the code but chokes
on a wxCOMPILE_TIME_ASSERT involving an inherited typedef. As this assert is
not critical, simply disable it for this compiler.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 23:47:09 +00:00
Stefan Csomor
add051eb7c make sure Raise is also activating the window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 20:40:24 +00:00
Stefan Csomor
58f8c1df48 missing release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 18:36:38 +00:00
Stefan Csomor
d2ec5847d6 support icns in bundle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 18:32:53 +00:00
Vadim Zeitlin
d326d52cd9 Use setUp/tearDown() for NumFormatter test case locale setup.
Setting the locale in the ctor of the test object doesn't work because the
locale is changed by the other tests that run before this one, use the
initialization method provided by cppunit to change the locale instead, this
is somewhat wasteful but at least it does work, unlike the old version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 15:08:11 +00:00
Dimitri Schoolwerth
3d59540f87 Improved detection of alpha channels in TIFF images.
Some TIFF images are not properly formed, for example having an extra channel marked as being unspecified data while they should be treated as being an alpha channel. Detect some of those cases so that these TIFF images now will have alpha.

Applied patch by gmeeker. Closes #12874.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 13:47:18 +00:00
Dimitri Schoolwerth
77b83d0a0f Added GIF and animated GIF saving support.
Applied (modified) patch by troelsk. Also added a basic unit test for checking the frames of a saved animated GIF (a previous unit test already handles content of a GIF with a single frame).

Closes #8583.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 12:28:31 +00:00
Dimitri Schoolwerth
818bc81a8b removed some leftover debugging code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 11:30:27 +00:00
Vadim Zeitlin
a54cf37118 Add wxIntegerValidator and wxFloatingPointValidator classes.
Add validators for integer and floating point numbers.

Add an example of their use to the validate sample as well as a new unit test
and documentation for them.

Use the new classes instead of wxTextValidator in wxGrid code.

Closes #12166.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 10:48:28 +00:00
Vadim Zeitlin
0d30c79b44 Update cached values in wxNumberFormatter when locale changes.
Caching the decimal and thousands separators in wxNumberFormatter is a useful
performance optimization, however it can give wrong results if the locale
changed since the cached values were initialized. So remember the locale used
for the initialization and redo it if it changed. This should still be almost
as fast as the previous version but now also correct (still not MT-safe
though).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 10:48:10 +00:00
Vadim Zeitlin
f2a5052baa Add support for long long to wxNumberFormatter.
It seems to make sense to allow using it for formatting and parsing long long
values as well as it can be done trivially using almost the same code as for
long.

It would be nice to support long double in a similar way but we don't wrap
C99 strtold() right now so it wouldn't be as simple, leave it for later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 10:47:57 +00:00
Vadim Zeitlin
066e5e3fd2 Add wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG symbol.
Instead of writing a rather unreadable "defined(wxLongLong_t) &&
!defined(wxLongLongIsLong)" expression every time we need to decide if a
function needs to be overloaded for both long and long long, add a new symbol
which can be tested directly.

No real changes in the code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 10:47:49 +00:00
Vadim Zeitlin
6686fbad16 Add wxNumberFormatter class helping to deal with thousands separators.
wxNumberFormatter formats and parses numbers with thousands separators.

Add the class itself as well as documentation and the unit test for it.

See #12166.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 10:47:40 +00:00
Vadim Zeitlin
6e91eb1f76 Mention modal dialogs in the wxWindow objects allocation guide.
The modal dialogs are an important exception to the usual rules of dealing
with wxWindow-derived objects so mention them here too.

Closes #12880.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 10:46:31 +00:00
Vadim Zeitlin
06f1b70464 Avoid collapsing the hidden root in wxTreeCtrl::CollapseAllChildren().
The hidden root item can't be collapsed so don't even try to do it as this
just results in an assert.

This is similar to the changes of r48097 in ExpandAllChildren().

Closes #12881.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 10:46:19 +00:00
Jaakko Salli
039aec5345 In wxStringProperty::ValueToString(), regenerate composed value string also when it was empty. This is needed in cases where property's children were added before property itself was added to the wxPropertyGrid (fixes #12877).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 09:33:17 +00:00
Robin Dunn
f8816e49e4 On OSX don't propogate the alignment setting from column to renderer if it is a custom renderer. This allows the Render function to deal with the alignment itself and brings the behavior into alignment (pun intended!) with the GTK and generic DV classes. Fixes #12883
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-19 08:09:51 +00:00
Julian Smart
4fe83b93a5 Fix for incorrect programmatic formatting (default style set immediately if not using Thaw/Freeze)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-18 13:34:10 +00:00
Julian Smart
07d4142fc4 Fixed some problems with floating objects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-18 12:32:02 +00:00
Jaakko Salli
eb40c2d836 Changed wxMSW wxGraphicsContext font rendering and extent calculation to take into the account that the page scale has been manually changed when using print contexts (fixes #12830)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-17 10:11:49 +00:00
Vadim Zeitlin
f8ecadbf74 Add skeleton documentation for wxAuiToolBar and related classes.
Add classes declarations to Doxygen-generated documentation. This doesn't
replace the real documentation but is better than nothing.

See #10232.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-16 23:24:37 +00:00
Vadim Zeitlin
c088756c88 Document wxDialog::ShowWindowModal().
This function is not yet really implemented under all platforms but provide
the documentation for it hinting at how (and where) it works.

Closes #12873.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-16 23:24:29 +00:00
Vadim Zeitlin
3f234d7a64 Override HasTransparentBackground() in wxHyperlinkCtrl to return true.
At least in wxMSW the control must override HasTransparentBackground() to
return true if it really wants its background to be transparent, so do it in
wxHyperlinkCtrlBase to fix the background appearance when using the generic
implementation in wxMSW.

See #12271.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-16 23:24:21 +00:00
Vadim Zeitlin
62441159cc Remove undefined wxScrollBarBase::Create() declaration.
Create() method in a base class can't be implemented and actually shouldn't
even have been defined there in the first place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-16 14:09:07 +00:00
Julian Smart
c99f1b0fd6 Corrected wrong range in GetText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-15 15:31:20 +00:00
Julian Smart
2865d42dd6 XML import corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-15 13:20:00 +00:00
Julian Smart
23bdfeee49 Small doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-14 19:32:54 +00:00
Julian Smart
bcc372381f Removed GCC 4 warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-14 19:32:35 +00:00
Julian Smart
d3cd6c6d22 Compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-14 12:15:17 +00:00
Julian Smart
2be72ac283 Compile fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-14 12:08:03 +00:00
Julian Smart
603f702b4a Implemented text boxes and tables, and further editing pages for backgrounds, borders and margins.
wxRTC functions now operate on the currently focused object, which by default is the whole buffer.
Up to three property commands are now shown on the context menu, depending on
available objects in the current hierarchy.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-14 11:57:44 +00:00
Vadim Zeitlin
3625820490 Fixes for parsing invalid HTML without tag ends.
The code in wxHtmlParser supposed in many places that a '<' character must be
always followed by a '>' one and could create (and sometimes dereference)
invalid iterators if this wasn't the case resulting in asserts from MSVC debug
CRT and possibly crashes.

Fix this by ensuring that only valid iterators are used and add a trivial unit
test for wxHtmlParser which checks that it can parse invalid HTML without
crashing.

Closes #12869.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-13 14:49:55 +00:00
Vadim Zeitlin
48d8ea6d93 No changes, just remove a level of indentation in wxHtmlTagsCache ctor.
Get rid of characters not starting a tag immediately in the beginning of the
loop instead of putting the entire loop body inside an if statement. This
doesn't change anything (this becomes more apparent if the patch is viewed
with "ignore white space changes" option) except making the code easier to
read and modify.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-13 14:49:44 +00:00
Vadim Zeitlin
2f7e8b765a Fix MSVC warnings about signed to unsigned conversion in the tests.
Recently modified client data test added calls to SetClient{Object,Data}(-1)
and MSVC complained about them, suppress these warnings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-13 14:49:34 +00:00
Jouk Jansen
27657c99cc wxComboBox::GetClassInfo() should not be defined here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-13 08:45:54 +00:00
Paul Cornett
7748d3d5c0 non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-12 18:04:39 +00:00
Jaakko Salli
df541b86f8 In wxBitmapComboBox::RecreateControl(), only call ChangeValue() if the control doesn't have wxCB_READONLY style (fixes #12859)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-12 17:58:09 +00:00
Vadim Zeitlin
4254f67216 Add support for icons in wxAUI panes title bars.
Add wxAuiPaneInfo::Icon() method and shows its use in the sample.

Closes #12856.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-12 13:39:36 +00:00
Vadim Zeitlin
17731af57d Fix crash in wxGenericRichMessageDialog::IsCheckBoxChecked().
The test for checkbox existence was inversed resulting in a guaranteed crash
when calling IsCheckBoxChecked() before showing the dialog.

Closes #12866.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-12 13:39:29 +00:00
Vadim Zeitlin
ed2da291ad Disable deprecation and other warnings in MFC sample.
VC8+ give tons of deprecation warnings for the standard functions which are
usually suppressed by wx headers but they need to be included first for the
suppression to be effective. In the MFC sample they were not resulting in many
useless warnings.

Fix this by pre-defining _CRT_SECURE_NO_WARNINGS to suppress them in the
sample itself.

Also suppress a warning about WINVER being undefined.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-12 13:39:24 +00:00
Vadim Zeitlin
0c9786de3a Fix entry point in Unicode build of the MFC sample.
MFC needs the entry point to be wWinMainCRTStartup() in Unicode builds but the
bakefile-generated projects use the default WinMain() so the sample didn't
link in Unicode.

Fix this by providing WinMain() which simply forwards to wWinMainCRTStartup()
as this seems to work for all MSVC/CRT versions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-12 13:39:16 +00:00
Jouk Jansen
bf3ed077c1 make sure wxNativeFontInfo is defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-11 17:05:43 +00:00
Jouk Jansen
76ab455a6b update OpenVMS makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-11 16:32:25 +00:00
Vadim Zeitlin
8584b0e64b Check index in wxItemContainer methods working with client data.
The test for index validity should be done by the base class public methods
themselves so that the protected methods in the derived classes don't need to
do it because this allows to have the check in one place only and not in every
port-specific derived class and also because a protected method can reasonably
expect to be called with already validated parameters.

This makes it unnecessary to perform the same check in many derived classes
and fixes the problem with those that forgot to check for item validity at all
before (like wxGTK wxChoice).

Also add a unit test checking for the correct behaviour. Unfortunately we
don't have any way to test for the precise assert being triggered so the test
passed for wxGTK wxChoice even before in debug builds because the expected
assert was raised by wxArray::Item() but the code crashed in release build --
whereas now it doesn't any more.

Closes #12858.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-10 12:00:54 +00:00
Vadim Zeitlin
ca275c039c Remove redundant top level const in wxRibbonBar::ShowPanels().
Use just "bool show" instead of "const bool show".

This fixes compilation for some compilers (notably OpenVMS one) broken since
r66612.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-10 12:00:44 +00:00
Stefan Csomor
12354f4676 adding new files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-10 11:42:10 +00:00
Stefan Csomor
fe43e2b641 adding new files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-10 11:40:56 +00:00
Stefan Csomor
1a4bb71138 adding new files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-10 11:32:34 +00:00
Paul Cornett
5eed855656 remove always-true test of unsigned >= 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 18:22:07 +00:00
Paul Cornett
dc771347d0 remove unneeded #includes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 18:05:33 +00:00
Paul Cornett
ec96ef0b6f fix GCC warning about not explicitly initializing base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 17:55:53 +00:00
Paul Cornett
703e3c42d1 remove always-true tests of unsigned >= 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 17:45:31 +00:00
Paul Cornett
8528d60a8a fix GCC warning about not explicitly initializing base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 17:33:51 +00:00
Paul Cornett
16a2525ff2 proper const-ness for GetLine() and operator[]()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 17:17:10 +00:00
Paul Cornett
d6d6a61fed proper const-ness for Item(), operator[](), and Last()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 17:16:29 +00:00
Stefan Csomor
c294641fd5 removing xti code which isn't necessary for unicode under trunk anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 10:22:30 +00:00
Stefan Csomor
f06d69376d rearranging xti code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 08:03:42 +00:00
Paul Cornett
4608b3f837 update docs after r66615
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 06:57:23 +00:00
Paul Cornett
0c3e2a5baa Move SendIdleEvents() from wxApp to wxWindow.
Use it to properly implement idle events for
wxGTK menubar, toolbar and statusbar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 06:42:41 +00:00
Stefan Csomor
8d6eed5f04 adding xti info for commandlinkbutton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 06:39:51 +00:00
Stefan Csomor
bca6bd3823 gcc fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 22:52:46 +00:00
Stefan Csomor
47f73cc455 bracketing xti-only methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 22:46:52 +00:00
Stefan Csomor
595663964a adding xti info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 22:37:43 +00:00
Stefan Csomor
1f6420d83a common rtti in nbkbase.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 22:31:26 +00:00
Stefan Csomor
38c69d200d correcting merge conflict
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 22:14:31 +00:00
Stefan Csomor
46b03af7ae common rtti in fontcmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 22:01:22 +00:00
Stefan Csomor
54912101ff avoid type conflict with univ wxMenuInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 21:51:19 +00:00
Stefan Csomor
46cd8dfd0a avoid type conflict with univ wxMenuInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 21:50:15 +00:00
Stefan Csomor
412e6a10cb fixing class name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 21:37:45 +00:00
Stefan Csomor
d27d59fb91 having menu classinfo at one place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 21:36:17 +00:00
Stefan Csomor
469b56ea63 routing to common classinfo for non-xti builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 20:55:00 +00:00
Stefan Csomor
17ca6e3b7d remove non-xti classinfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 20:06:14 +00:00
Václav Slavík
b06ed2f866 Implement wxCOL_WIDTH_AUTOSIZE on OS X.
Only Cocoa build on 10.5+ is supported. Before that, NSOutlineView
didn't have reasonable support for determining cell sizes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 18:26:58 +00:00
Paul Cornett
6a50a2c4d3 move default OnInternalIdle processing to wxWindowBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 18:15:21 +00:00
Stefan Csomor
1bf29304cc updated xti sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 18:14:45 +00:00
Stefan Csomor
88a4f868fd xti changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:50:25 +00:00
Stefan Csomor
e765d7ee73 xti changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:49:18 +00:00
Stefan Csomor
44370b509e removing xti info from msw specific files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:46:54 +00:00
Stefan Csomor
9f855638c3 removing xti info from msw specific files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:45:58 +00:00
Stefan Csomor
0a8d6945ae aligning definition of rtti
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:44:11 +00:00
Stefan Csomor
6c887ddefb xti changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:43:12 +00:00
Stefan Csomor
4e3762c9e2 adding range type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:42:39 +00:00
Stefan Csomor
93f70fead9 moved xti info to common file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:41:14 +00:00
Stefan Csomor
aa3fcb2f83 props
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:29:23 +00:00
Stefan Csomor
a26fe24301 additional file, test auto-props
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:28:18 +00:00
Stefan Csomor
cbca59a8fb XTI updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:22:59 +00:00
Paul Cornett
e4e265ebf6 remove some extraneous semicolons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:20:31 +00:00
Paul Cornett
06e363eaa6 build fix, should have been part of r66615
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 17:18:38 +00:00
Jouk Jansen
fd423a0f8f Update OpenVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 14:03:51 +00:00
Dimitri Schoolwerth
b057ac075b Fixed saving PNG in wrong format sometimes.
When explicitly requesting saving as a palettised image but then later on that turns out to not be possible (or desired) the image would be marked as PNG_COLOR_TYPE_GRAY or PNG_COLOR_TYPE_GRAY_ALPHA. Simply set the colour type to RGB if this occurs also updated the unit test to catch this case.

This is similar to the fix in r66590 but that one was related to wxUSE_PALETTE == 0 cases.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 08:48:43 +00:00
Paul Cornett
17811bf9c9 build fix, should have been part of r66615
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 06:45:29 +00:00
Paul Cornett
081d8d96db Move wxColourData and wxFontData into separate files.
This eliminates a linking dependency that would drag in the printing
code for any program that used wxColourDialog or wxFontDialog (which
is currently all of them, due to more link dependencies...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 05:26:57 +00:00
Paul Cornett
807902f119 build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 04:51:21 +00:00
Paul Cornett
d2bc87252a non-pch build fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 04:50:53 +00:00
Vadim Zeitlin
3603e5658f Add possibility to hide panels in wxRibbon.
Add wxRibbonBar::{Show,Hide}Panels() and ArePanelsShown() accessor.

Also add a toggle button to the sample to test the new functionality
(unfortunately it couldn't be done by a control in the ribbon itself as there
would be no way to show the panels back then).

Closes #12707.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-06 22:02:07 +00:00
Steve Lamerton
3a194bda7b Add missing code tag before lots of wxEventTypes in the documentation. Although most of the documentation did this quite a few were missing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-06 19:52:14 +00:00
Václav Slavík
40fc5b2f71 Fix typo and a leftover.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-06 14:33:19 +00:00
Stefan Csomor
986a59561a reverting AssignAny fix, not needed if wxAny is not instantiated during static globals init
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-06 12:05:41 +00:00
Stefan Csomor
f41d5991df fixing a few typos, wxAny copy constructor implementation, making wxAnyList available everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-06 11:06:12 +00:00
Jouk Jansen
27a5c70277 Update compile support for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-06 09:30:33 +00:00
Vadim Zeitlin
dac1ab1279 Remove wxFileSystemWatcher::OnXXX() virtual methods documentation.
These functions don't exist any more (they had been present initially but were
removed in r61484 and r61476 for Unix and MSW respectively) so don't document
them.

See #12847.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 23:54:15 +00:00
Vadim Zeitlin
c6eea7ff8b Correct wxFileSystemWatcher::GetWatchedPathsCount() documentation.
The method name was misspelt.

Also improve the description slightly.

See #12847.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 23:54:08 +00:00
Vadim Zeitlin
bbce6969f6 Correct measurement for owner drawn menu items with only unchecked bitmap.
Check for either checked or unchecked bitmap being specified for the item
instead of checking the checked/normal bitmap twice which was an obvious typo
and also resulted in items with unchecked bitmap only not being measured
correctly (although I'm not sure if this is actually a supported use case).

Closes #12846.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 23:52:56 +00:00
Vadim Zeitlin
95908499c5 No changes, just fix a typo in a variable name.
s/widtht/width/

See #12846.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 23:49:11 +00:00
Paul Cornett
f9405a952c make wxMarkupEntities fully const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 18:38:33 +00:00
Paul Cornett
f313deaa38 move variable definitions to more appropriate places, remove now-empty src/common/datacmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 18:27:58 +00:00
Dimitri Schoolwerth
07e99d8782 Allow loading 8-bit TGA images when wxUSE_PALETTE is set to 0.
Previously the image would only be loaded when wxPalette is available. This is unneccessary and probably not wanted. Instead decode as usual but use a plain memory buffer for the palette instead of wxPalette functions and don't set the image's palette.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 11:41:22 +00:00
Dimitri Schoolwerth
13c5d825d3 Always save PNG as a true colour image instead of possibly a palettised image when wxUSE_PALETTE is set to 0.
With wxUSE_PALETTE set to 0 and the user forcing to want a wxPNG_TYPE_PALETTE format the image would (partially) be marked as PNG_COLOR_TYPE_GRAY or PNG_COLOR_TYPE_GRAY_ALPHA instead and also saving would fail later on. Instead detect this specific case and save in the wxPNG_TYPE_COLOUR format.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 11:39:44 +00:00
Dimitri Schoolwerth
5d875c119e fixed compilation of image test units when wxUSE_PALETTE is set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 11:37:52 +00:00
Stefan Csomor
13830d6ff8 was missing in xti merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 10:44:14 +00:00
Stefan Csomor
19d85aac23 was missing in xti merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 10:29:54 +00:00
Stefan Csomor
5e8b5272d8 was missing in xti merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 09:56:32 +00:00
Jouk Jansen
9dbd8fc741 Update compile support for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 07:30:46 +00:00
Paul Cornett
e1d3601aca set eol-style and keywords properties on new files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 06:56:36 +00:00
Vadim Zeitlin
2960bae821 Fix wxImage test compilation for MSVC6.
Don't reuse variables declared inside for loops as VC6 doesn't implement
proper scoping for them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 23:48:09 +00:00
Vadim Zeitlin
72f1a5d605 Disable wxCompositeWindow<> code for VC6.
Revert the attempt to work around VC6 bug from the last commit and simply
disable this code completely for VC6, it's not worth the trouble to try to fix
it for this compiler.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 21:33:16 +00:00
Dimitri Schoolwerth
e38f5435fb compilation fixes for wxMSW compilation with wxUSE_PALETTE set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 19:00:10 +00:00
Vadim Zeitlin
5ed8e4e2e4 Attempt to make wxCompositeWindow<> compile with MSVC6.
Blind attempt to work around VC6 error about ambiguity between "const T&" and
"T" in DoSetForAllParts() template function.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 17:08:57 +00:00
Vadim Zeitlin
339e9747d2 Remove duplicate IMPLEMENT_XXX_CLASS macros from wxUniv code.
The RTTI macros are now used in common code only and having them in wxUniv too
results in linker errors because of duplicate symbols. Just remove them to fix
this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 16:21:42 +00:00
Vadim Zeitlin
f9c77abc2b Declare wxStaticText in wxUniv as being dynamic, not abstract, class.
This fixes a wxUniv build error due to the use of IMPLEMENT_DYNAMIC_CLASS()
for wxStaticText in common code now.

Closes #12842.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 16:21:29 +00:00
Vadim Zeitlin
967956ddcf Compilation fix for PNG saving code when wxUSE_PALETTE==0.
Don't handle wxPNG_TYPE_PALETTE and don't compile PaletteFind() in at all when
wxUSE_PALETTE is off.

Closes #12505.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 15:10:09 +00:00
Stefan Csomor
264b16122e correct macro name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 15:08:25 +00:00
Stefan Csomor
5c60815264 is a #deffed var
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 14:37:54 +00:00
Vadim Zeitlin
37788684ba Use wxControl instead of wxControlWithItems with wxRTTI macros.
wxControlWithItems is just a convenient combination of wxControl and
wxItemContainer mix-in and it is not useful to include it in wxRTTI classes
hierarchy. Also, using wxControlWithItems as the base class for wxChoice and
wxListBox but not for wxComboBox is inconsistent but wxControlWithItems can't
be used for the latter so resolve this by not using it at all.

Ideally we'd have a way of retrieving the list of supported interfaces (such
as wxItemContainer or wxTextEntry) via wxRTTI too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 14:13:29 +00:00
Vadim Zeitlin
f638c25742 Use wxControl as wxComboBox base class for wxRTTI in all ports.
wxComboBox only derives from wxChoice in wxMSW but not in the other ports so
use wxControl as its base class in wxIMPLEMENT_DYNAMIC_CLASS_XTI() macro in
all ports.

See #12841.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 14:13:17 +00:00
Stefan Csomor
72259abb8a fixing rti
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 14:09:41 +00:00
Dimitri Schoolwerth
50fa616c35 Minor wxPNGHandler cleanup.
Use int instead of png_uint_16 everywhere regarding number of palette entries, similar to how libpng exposes it (internally it uses png_uint_16).



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 13:33:48 +00:00
Dimitri Schoolwerth
1de255d613 Fixed deprecated usage warnings in wxPNGHandler.
Since upgrading to a newer libpng its structure members are marked as deprecated (probably as a way to discourage their direct usage). Replaced accessing them by using function calls instead.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 13:06:45 +00:00
Stefan Csomor
65918917b1 add rtti for generic class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 12:52:12 +00:00
Vadim Zeitlin
3e8dba905b Remove duplicate IMPLEMENT_DYNAMIC_CLASS() for wxGtkCalendarCtrl.
wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCalendarCtrl) in the common code makes the use
of IMPLEMENT_DYNAMIC_CLASS() in wxGTK implementation unnecessary.

This fixes wxGTK linking.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:48:14 +00:00
Vadim Zeitlin
cfa7a6e239 Don't use "/*" inside a C comment.
gcc warns about it so replace the outer comment with "#if 0" to avoid it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:48:06 +00:00
Dimitri Schoolwerth
90e10cd1be Cleaned up wxGIFDecoder.
Applied patch by troelsk which mostly makes the GIF decoder more readable by using named constants instead of magic numbers. Left out the edits that changed unsigned char to wxUint8. In addition removed unnecessary casts around wxInputStream.GetC() calls.

Closes #12506.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:47:53 +00:00
Stefan Csomor
6e45339c29 removing msw dependency in non-precomp build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:41:43 +00:00
Vadim Zeitlin
a1061906dd wxMSW compilation fix for wxCompositeWindow.
Not all ports override SetXXX() methods in their wxWindow class so use the
versions from wxWindowBase which are definitely known to exist. Notice that
the call itself is still virtual so it doesn't matter which base class do we
use.

Closes #12840.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:33:19 +00:00
Vadim Zeitlin
cc72cde0ea Mention that wxDV_ROW_LINES is not implemented in the generic version.
wxDV_ROW_LINES is currently only supported by the native implementations of
wxDataViewCtrl.

See #12834.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:30:40 +00:00
Stefan Csomor
8261989803 removing msw dependency in non-precomp build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:17:25 +00:00
Stefan Csomor
62d70b3921 porting back exact semicolon version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 10:47:15 +00:00
Stefan Csomor
232e807500 fixing placing of common files for grid and calctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 10:46:18 +00:00
Stefan Csomor
5c06430713 fixing duplicate rti info for gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 09:20:10 +00:00
Stefan Csomor
4e5167dd93 fixing duplicate rti info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 09:14:40 +00:00
Stefan Csomor
e7478376f1 fixing duplicate rti info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 09:13:49 +00:00
Stefan Csomor
7dc701d6eb updating xti makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:34:15 +00:00
Stefan Csomor
2895324520 merging back XTI branch part 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:31:53 +00:00
Stefan Csomor
f0c6b96336 fixing selectors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:28:43 +00:00
Stefan Csomor
f437e1552a add methods needed for XTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:25:19 +00:00
Dimitri Schoolwerth
8ee313d2be Added support for saving PNG files with palette.
Based on (heavily modified) patch by troelsk.

Closes #12505.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 22:22:16 +00:00
Vadim Zeitlin
41514cc474 Set up pages range in the wxMSW print dialog correctly.
Propagate the information about the number of pages from the printout to the
print dialog in wxWindowsPrinter::Print().

Closes #12819.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:44:36 +00:00
Vadim Zeitlin
ca8b470a41 Add "virtual" keywords to the overridden functions in the printing sample.
There are no real changes, just make it easier to understand that the sample
code overrides the base class virtual methods by reusing the virtual keyword
in the derived class.

See #12819.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:44:16 +00:00
Vadim Zeitlin
dd378f3ecb Don't create slider with invalid range in mediaplayer sample.
Use dummy but valid [0, 1] range instead of invalid [0, 0] one.

Closes #12828.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:43:54 +00:00
Vadim Zeitlin
fb1e645577 Don't name variables "id" in public headers.
This name clashes with Objective-C reserved keyword and so prevents the
headers using it from being included from Objective-C++ code.

Closes #12832.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:43:30 +00:00
Stefan Csomor
58ce18f2fd fixing warning and compile error against 10.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:08:11 +00:00
Stefan Csomor
cc3977bf13 adding new files for xti merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 17:43:49 +00:00
Paul Cornett
e4c3d9409a build fix for wxUSE_CONSOLE_EVENTLOOP==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 17:15:37 +00:00
Paul Cornett
424da8bdb9 non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 17:06:43 +00:00
Vadim Zeitlin
41e1c9d898 Decrease the margins around the page in the print preview.
Don't hard code 40 pixel margins, this may be too big on small screens.

Use twice the default border size between the dialog elements instead, this is
still pretty arbitrary but at least smaller.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:57:42 +00:00
Vadim Zeitlin
e562dfb1a0 Don't hardcode wxPreviewControlBar size in print preview code.
For some reason the control bar height was hard coded to 40 pixels which could
be not enough to use the buttons of the appropriate size. Don't hardcode its
size any more and let the sizer determine it instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:57:30 +00:00
Vadim Zeitlin
825794618f Improve print preview appearance and functionality.
Allow to directly enter the page number in the print preview itself instead of
opening a separate dialog in order to do it.

Rearrange the buttons in more visually appealing groups and replace the text
arrows in them with the images.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:57:21 +00:00
Václav Slavík
8d96f54dfd Debug messages aren't meant to be translated.
Fixed several incorrect uses of _() in dataview_osx.cpp.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:34:10 +00:00
Vadim Zeitlin
64d79e1617 Don't use deprecated NSTableView selectRow:byExtendingSelection: method.
Use selectRowIndexes:byExtendingSelection: instead even if this means that we
need to create a trivial NSIndexSet containing a single index only.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 14:58:47 +00:00
Vadim Zeitlin
e62e216806 Allow selecting any kind of file in the sound sample.
This is especially useful under Mac where wxSound can play files other than
.wav too (e.g. .aiff files which can be found under /System/Library/Sounds).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 14:58:26 +00:00
Jouk Jansen
07549c391e update configuration for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 13:46:00 +00:00
Vadim Zeitlin
a9e41db760 Add wxCompositeWindow<> and use it in wxDatePickerCtrlGeneric.
wxCompositeWindow<> is a convenient base class for composite windows, i.e.
windows consisting of several other wxWindows. Currently it just automatically
forwards various attributes setters calls to all of the composite window parts
but it could become more useful in the future.

Similarly, for now it is only used in wxDatePickerCtrlGeneric but it could
(and should) be used for other composite controls later and we probably should
even make this class public to allow its use in the client code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 11:24:13 +00:00
Vadim Zeitlin
b9acd101f7 No real changes, just remove an unneeded header dependency.
There was some commented out code in (core) valgen.cpp file using
wxDatePickerCtrl (from adv library). Also comment out the inclusion of
wx/datectrl.h header as it's not needed as long as this code remains commented
out and creates an unexpected dependency of a core library file on an adv
library header.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 11:23:49 +00:00
Dimitri Schoolwerth
df16cb09b1 Fixed compilation of datectlg.cpp.
Only including wx/datectrl.h does not always include wx/generic/datectrl.h, for example it does not for MSW non-Universal. As a result when compiling datectlg.cpp wxDatePickerCtrlGeneric is unknown and compilation fails. Fixed by including wx/generic/datectrl.h again (regression since r66524).



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 11:01:59 +00:00
Vadim Zeitlin
18f42b94df Remove calls to wxApp::SetTopWindow() from the samples and documentation.
It is definitely not necessary to call SetTopWindow() when there is only a
single top level window and it is arguable whether it's useful to do it even
when there are many of them so don't encourage its use in the documentation
and also remove all its occurrences from the samples.

Closes #12816.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:05:14 +00:00
Vadim Zeitlin
30d6c59b29 Simplify wxFileNameFromPath() implementation to avoid redundancy.
No real changes, just use wxFileName::GetFullName() in wxFileNameFromPath()
instead of reimplementing it there.

Closes #12818.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:04:48 +00:00
Vadim Zeitlin
13705b8ccf Fix memory leak if wxDC::DrawBitmap() fails in wxOS2.
Don't forget to free the buffer if we return abnormally.

Closes #12825.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:04:38 +00:00
Vadim Zeitlin
b622441a8d Use correct delete[] for a buffer allocated with new[].
Fix mismatch between scalar new and array delete in GetPathForIconFile() in
wxOSX wxMimeTypeManager code.

Closes #12826.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:04:18 +00:00
Vadim Zeitlin
4a40cd9bae Forward declare classes instead of including their declarations.
No real changes, just reduce the compilation dependencies a bit by only
forward declaring wxComboCtrl and wxCalendarCtrl in wx/generic/datectrl.h
instead of including the headers with their full declarations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:03:56 +00:00
Paul Cornett
da2f117200 fix preprocessor expression, closes #12822
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 16:59:15 +00:00
Jaakko Salli
103bfa6f95 Allow any.cpp to compile without wxDateTime support (see #12821)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 16:49:50 +00:00
Jaakko Salli
6f3f38980f Added 'HasAlpha' attribute for wxColourProperty. Setting it to true allows user to edit the alpha component.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 10:14:29 +00:00
Stefan Csomor
2e5f9929e6 pusing a dummy event, to make sure the stop: succeeds in immediate runloop termination, instead of waiting for the next user event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-01 16:25:37 +00:00
Stefan Csomor
29188693b3 bracketing msw enhanced metafile usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-01 11:10:35 +00:00
Stefan Csomor
cb98e78b1e fixing iterator comparison
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-01 11:06:16 +00:00
Vadim Zeitlin
91d98deb2f PCH-less compilation fix in recently added wxTangoArtProvider.
The use of wxLogDebug() requires inclusion of wx/log.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 19:38:49 +00:00
Vadim Zeitlin
2e9b5717cd Add wxUSE_ARTPROVIDER_STD build option.
Make it possible to exclude wxDefaultArtProvider from build. Now that a
Tango-based provider exists, it may make sense to disable the standard bitmaps
if the program doesn't need the few of them not provided by Tango anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:39:37 +00:00
Vadim Zeitlin
c1d2466a79 Add wxArtProvider using Tango icons.
The icons are embedded as PNG images directly in the source code to avoid the
need for installing them. This does make the library larger though so provide
a wxUSE_ARTPROVIDER_TANGO option to turn the new code and associated bloat off.
Also turn it off by default under wxGTK as the native art provider is used
there anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:39:25 +00:00
Vadim Zeitlin
a7cfad3ad6 Add go to first/last and plus/minus art provider icons.
These icons will be used in the upcoming new implementation of the print
preview frame and as they are also natively supported by GTK+ it makes sense
to have support for them in wx itself.

Notice that the existing bookmark add/remove icons are already mapped to the
icons which look like plus and minus signs respectively in wxGTK but we need
plus/minus in print preview in the other ports too so add these icons under
explicit names.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:39:01 +00:00
Vadim Zeitlin
19be42b760 Make art provider id of type "char *" instead of "wxChar *".
These strings don't need to be wide and, as elsewhere, prefer the
compatibility with 2.8 ANSI build to compatibility with Unicode build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:38:51 +00:00
Vadim Zeitlin
46eada874a Add an option to embed image size in its name to PNG-to-C script.
When a PNG image exists in several sizes it makes sense to use its size as a
suffix to distinguish the different versions, so update the png2c script to
optionally allow to do this.

Current implementation simply checks the PNG header directly to avoid any
extra dependencies.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:38:40 +00:00
Vadim Zeitlin
7b8983996e Show wxART_BUTTON icons in art provider sample resource browser.
The button icons have a different size from all the other clients in wxGTK so
it may be interesting to see them in the sample, add wxART_BUTTON to the list
of art clients that can be chosen in it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:38:35 +00:00
Vadim Zeitlin
b8502fa7c4 Accept file names with dashes in PNG-to-C converter.
Tango icon files often have dashes in their names so accept them in png2c
conversion script and simply replace them with underscores to form a C
identifier for the array containing the image data.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:38:29 +00:00
Vadim Zeitlin
242df7673d Use open command to run the GUI unit test on Mac build slave.
Running the application binary directly still doesn't work quite the same as
when it's opened from Finder (or executed using open) and some tests involving
event loops fail because of this.

Run it using open even if it means that we lose the detailed log output.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 17:29:39 +00:00
Jaakko Salli
7fa3cf6a64 Revert unintended commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 15:23:19 +00:00
Jaakko Salli
4f320d7c57 Try to better revert to the original string value in wxBitmapComboBox::RecreateControl()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 15:20:32 +00:00
Vadim Zeitlin
204530b0f7 Document how to get the previous selection in wxEVT_GRID_SELECT_CELL handler.
Make explicit the fact that the cell coordinates in the event are the
coordinates of the newly selected cell and that the previously selected one is
available from wxGrid itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-31 13:12:56 +00:00
Vadim Zeitlin
0b0bed0fca Move wxMSW wxCommandLinkButton files to native-only part.
wxMSW wxCommandLinkButton implementation shouldn't be used in wxUniv so move
src/msw/commandlinkbutton.cpp and include/wx/msw/commandlinkbutton.h to
ADVANCED_MSW_NATIVE_{SRC,HDR} from ADVANCED_MSW_{SRC,HDR} in files.bkl and
rebake the makefiles.

This fixes wxUniv/MSW compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-30 22:37:17 +00:00
Vadim Zeitlin
402bacb376 Compilation fixes for wxUniversal/MSW.
Don't use wxMSW-specific functions when building wxUniversal.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-30 22:37:10 +00:00
Vadim Zeitlin
9aea251043 Move wxGetLibraryVersionInfo() to core from base.
This function uses the GUI toolkit information and so can't be defined in
wxBase. The code only compiled before because the function was erroneously
defined in wxCore even though it was declared as WXDLLIMPEXP_BASE.

Fix this by declaring it with WXDLLIMPEXP_CORE too. This corrects problems in
MSW DLL build.

If we need to get a string containing user-readable wxBase version too, we
should add another function (as it's not possible to virtualize this one) but
such function doesn't seem incredibly useful to have anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-30 22:37:03 +00:00
Vadim Zeitlin
2e49a8074e Don't crash on malformed HTML in wxHTML font tag handler.
Don't try to access the first character of the size parameter value before we
are sure that it is not empty.

Closes #12812.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-30 22:36:56 +00:00
Dimitri Schoolwerth
b4c470164c Tightened icon and cursor file detection heuristics.
When loading a TGA file that has an image type of uncompressed true colour it would be falsely detected as a cursor file and as an icon file if type is of uncompressed colour mapped. Lower the chance of this happening by also checking the remaining member of an ICO and CUR header which represents the number of images in the file. This member has to be non-zero (checked against all found ICO and CUR files in an XP installation).

See also #12702.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-29 12:31:37 +00:00
Vadim Zeitlin
f74686cba0 Update the generated makefile after wxOSX OpenGL changes.
Rebake the makefile after the changes in r66357.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-29 00:01:48 +00:00
Dimitri Schoolwerth
3d926ff8a9 Added saving support to TGA image handler.
Supports saving 24-bit and 32-bit (RGB with alpha).
Updated image unit test to verify the alpha channel of saved TGA images. Also removed a condition skipping a test which only was in place for TGA (formerly its saving handler would do nothing yet say saving was succesful).

See also #7661.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-28 22:38:04 +00:00
Dimitri Schoolwerth
5828d76add Expanded existing image saving test to also verify alpha content of saved images.
Compare the alpha data of saved images (where applicable, currently for PNG only) to a generated alpha channel. Refactored most of ImageTestCase.CompareSavedImage into (static) function CompareImage to easily compare with a 24-bit image and then a 32-bit one.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-28 22:05:01 +00:00
Dimitri Schoolwerth
2b39567fd4 Added some simple unit tests for verifying pixel content of loaded and saved images.
Compare the data of loaded images in different formats against a reference image (one for 8-bit images, another for 24-bit). Do the same for images saved using SaveFile. Excluded some formats because they are either lossy or don't pass the test right now.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-28 19:50:41 +00:00
Stefan Csomor
95647df73d removing obsolete NO_PRAGMA
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-28 16:44:15 +00:00
Dimitri Schoolwerth
4324917a76 Updated manual regarding image alpha support for BMP, PNG, and TIFF handlers.
For PNG it was mentioned only loading supports alpha, but alpha saving support has been available since r32414. Similarly there was no mention of alpha loading support for TIFF (supported since r47204) as well as BMP (since r54942).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-28 15:57:44 +00:00
Robin Dunn
05b0355af8 Fix various missing or broken stuff needed for Project Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 20:47:12 +00:00
Stefan Csomor
e0db57da4c adding backtab to exception list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 13:16:54 +00:00
Jaakko Salli
61fac071c3 Removed AdvImageFileProperty from the wxPropertyGrid sample. It was somewhat impractical and bug-prone.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 11:50:34 +00:00
Jaakko Salli
6ea6c5127c Test wxPropertyGrid::DoubleToString()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 11:25:53 +00:00
Jaakko Salli
538f4dd82b No longer use semi-static IDs for wxPropertyGrid embedded controls and tool bar tools.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 11:17:40 +00:00
Stefan Csomor
a46cbd24b4 adding backtab to exception list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 06:31:14 +00:00
Stefan Csomor
3a853d9e1e make sure we always have a return value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 06:30:42 +00:00
Vadim Zeitlin
e279a9e799 Increase wxStaticText height in wxMSW to align its text with wxTextCtrl.
The base lines of the text in wxTextCtrl and wxStaticText which were
themselves vertically aligned didn't align, the text in the latter was one
pixel too low. This seems to be happening because we don't give enough
vertical space to the native static control by default and so, while the text
wasn't truncated, it was positioned differently than usual.

Work around this problem by allocating two extra pixels to wxStaticText
height. While the exact explanation of the problem remains mysterious, this
hack does result in correct appearance which seems to be sufficiently
important to apply it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-26 16:29:22 +00:00
Vadim Zeitlin
f740587c9d Compilation fix for wxMSW build without PCH.
We need wxApp declaration since the changes of r66425.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-25 14:19:07 +00:00
Vadim Zeitlin
3931f3ecc1 Test for wcsftime() in configure as it's not available everywhere.
Contrary to the comment in wx/wxcrtbase.h, wcsftime() doesn't seem to be
available under quite all the systems, notably it doesn't seem to be present
in OpenBSD at all, even in the very latest version.

Add a configure test for this function and fall back to our own implementation
if the system doesn't have it.

Closes #12766.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-25 14:18:58 +00:00
Vadim Zeitlin
869704349c Give an error from configure if wchar_t is not available.
wxWidgets 2.9 doesn't support building without wchar_t any more so always
define wxUSE_WCHAR_T and give an error from configure if wchar_t is really not
available.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-25 14:18:50 +00:00
Vadim Zeitlin
3013861102 Make the margin between wxSpinCtrlGeneric sub-windows compatible with MSW.
Native MSW wxSpinCtrl uses a single pixel margin between the text part and the
spin button while the generic version used 2 pixels which resulted in a
slightly different appearance (see #12767).

Use the same margin as MSW now in the generic version too, it should be fine
for the other platforms as well and if it isn't we can always tweak them
later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-25 13:46:29 +00:00
Vadim Zeitlin
6f0b6fd1e4 Correct bug in the wxSpinCtrlGeneric sub-controls resizing.
The code in DoMoveWindow() didn't account for the margin and made the text
control part of the window too large resulting in the truncation of the spin
button.

Simply remember to take margin into account when computing the text width.

See #12767.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-25 13:46:23 +00:00
Vadim Zeitlin
3256418982 Document wxItemContainer::SetStringSelection() as case-insensitive.
Add unit tests checking that the behaviour really corresponds to the
documentation too.

And also mention that it's not a good idea to have strings differing by case
only in wxComboBox anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-25 13:19:00 +00:00
Vadim Zeitlin
1db02a5e5c Minor improvements to wxComboBox documentation.
Mention that wxCB_DROPDOWN is MSW (and Motif...) specific and don't document
the much more often used wxCB_READONLY in its terms, just describe it directly
instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-25 13:18:52 +00:00
Vadim Zeitlin
5bf7b950a4 Run tests with "-t" option on OS X too.
OS X build slave used its own commands to run unit tests, add -t to them too
to be (hopefully) able to see better where does the test crash exactly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-23 12:48:00 +00:00
Vadim Zeitlin
ed8f0b0675 Correct Mac OX/iPhone check in libpng.
Correct the syntax of preprocessor check for wxOSX_USE_IPHONE in libpng, it
got somehow broken during upgrade to 1.4.4.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-23 12:47:53 +00:00
Jaakko Salli
db1087d2fd Added dummy GetTextWidget() implementation for wxMotif wxComboCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-23 10:26:06 +00:00
Jaakko Salli
94f090f241 Added section 'Customizing Keyboard Handling' into wxPropertyGrid overview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 18:44:42 +00:00
Jaakko Salli
95fbeee5ac Bring AddActionTrigger() doc string up to date with the interface
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 17:43:49 +00:00
Jaakko Salli
abbd88b52b Added wxPG_ACTION_EDIT, which allows specifying custom key to move focus to the property editor. Also documented wxPG_ACTION_FOOs better.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 17:25:45 +00:00
Vadim Zeitlin
853149575e Switch to GtkTooltip from deprecated GtkTooltips in wxGTK wxToolTip.
Don't use deprecated GtkTooltips in wxGTK code any more, use the new
GtkTooltip instead.

Closes #12034.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 13:57:28 +00:00
Vadim Zeitlin
65776a1582 Really fix recently broken accelerators handling in menu items.
As wxAcceleratorEntry::Create() now expects the full menu item label, just
pass GetItemLabel() to it in wxMenuItemBase::GetAccel() instead of half-
parsing it ourselves there.

Closes #12794.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 13:57:21 +00:00
Vadim Zeitlin
fd324b2954 Implement proper wxCursor cloning in wxDFB.
wxDFB compilation was broken by recent wxObjectRefData copy ctor-related
changes. Fix it by not using wxCursorRefData copy ctor any more, call
wxCursorRefData::Clone() which does the right thing explicitly instead.

Closes #12791.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 13:57:15 +00:00
Vadim Zeitlin
41271da4af Use stock ids for menu items in the config sample.
This not only removes some unnecessary code from the sample but also fixes a
problem due to the use of a 0 id under wxOSX (which is unsupported there).

Closes #12788.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 13:57:08 +00:00
Vadim Zeitlin
ac78a90a1a Compute print preview scale using real DPI values in wxGTK.
Replace hardcoded 72 DPI which was "compensated" for with a 0.8 fudge factor
with the values using the real screen DPI in wxGTK and PostScript print
preview classes.

Closes #12777.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 13:57:03 +00:00
Vadim Zeitlin
ba67d647e8 Correct and extend wxConfig::Create() documentation.
Replace mentions of the non-existent wxCONFIG_WIN32_NATIVE with
wxUSE_CONFIG_NATIVE. Also explain what does the "best implementation" really
mean and link to wxAppTraitsBase::CreateConfig().

Closes #12787.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 13:56:56 +00:00
Vadim Zeitlin
acd0b94c38 Use generic wxHyperlinkCtrl under Vista/7 without comtrl32.dll v6.
Replace the test for the OS version with the test for comtrl32.dll version in
HasNativeHyperlinkCtrl() wxMSW function as the native control could be not
available even under Vista/7 if we're not using comtrl32.dll v6 and this can
happen if the program was linked without the appropriate manifest or, possibly
more likely, if a DLL using wxWidgets was loaded by such a program.

Closes #12711.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-22 13:56:49 +00:00
Robert Roebling
b9293331c6 Don't let anything, such as pressing F2, start editing an entry if the renderer is set to wxDATAVIEW_CELL_INERT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-21 19:38:52 +00:00
Robert Roebling
d93cc83080 model column and index of column in the dataview can be different, correct this and also make wxGTK and wxMSW report the same thing in the event following wxDataViewModel::SetValue(), fixes #12755: wxDataViewCtrl bug when the column is mapped to different model column. Also commit some older change reseting the cursor under the mouse.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-21 19:27:35 +00:00
Julian Smart
925a662ab0 Fixed bad rendering with tabs by correcting the position tabs are calculated from
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-21 11:11:25 +00:00
Robert Roebling
e97f9fbd63 Better wording in docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 19:15:15 +00:00
Robert Roebling
9c09addd35 Correction to: Support diabling items in GTK+, see #12686: Allow disabling of wxDVC items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 19:13:13 +00:00
Jaakko Salli
9a7f467140 Removed non-implemented function prototype OnMouseWheel() from wxVListBoxComboPopup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 14:54:04 +00:00
Jaakko Salli
a2abe5f081 Use locale-specific decimal point in wxNumericPropertyValidator (fixes #12790)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 14:21:13 +00:00
Jaakko Salli
997ddb2ced Added OwnerDrawnComboBoxTestCase (currently only has copies of wxComboBox tests)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 13:55:40 +00:00
Jaakko Salli
238b33ab0e Added wxComboPopup::FindItem() to help in deciding how SetValue() should change the value of a read-only wxComboCtrl. This allows wxOwnerDrawnComboBox to have the same behavior as wxComboBox in that respect.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 13:51:24 +00:00
Jouk Jansen
f179b35ec2 correction to make wxGTK1 compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 13:33:39 +00:00
Jaakko Salli
a7f62f3909 Have wxUniv wxComboBox inherit from wxItemContainer instead of wxComboBoxBase, since the latter is derived from wxTextEntry which conflicts with the recent change in wxComboCtrl (fixes #12789)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 11:27:13 +00:00
Jaakko Salli
084a875a2e Added dummy-wxTextEntry implementation section for wxUniversal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 11:23:14 +00:00
Jouk Jansen
256e97fb7d include compile support for tests on OpenVMS (part3)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-20 09:23:57 +00:00
Robert Roebling
9fc221aa81 Support diabling items in GTK+, see #12686: Allow disabling of wxDVC items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-19 19:43:46 +00:00
Vadim Zeitlin
98f8e6666b Add the possibility to disable invisible wxDataViewCtrl items.
Add new wxDataViewModel::IsEnabled() and wxDataViewListStore::IsEnabledByRow()
methods and implement support for actually disabling the items in wxOSX/Cocoa
native implementation of wxDataViewCtrl and limited support for it in the
generic version.

We need to implement this in wxGTK using GtkCellRenderer "sensitive" propriety
later.

Closes #12686.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-19 15:02:56 +00:00
Vadim Zeitlin
46405e36bf Store menus titles in menus themselves in wxOSX.
Get rid of wxMenuBar::m_titles array which doesn't seem to be needed and just
store the titles in the menus themselves instead. This makes wxMenu::GetTitle()
work as in the other ports and fixes unit test failures in menu test.

It also makes it unnecessary to duplicate the base class Find[Menu]Item()
methods in wxOSX wxMenuBar so simply remove them entirely.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-19 15:02:45 +00:00
Vadim Zeitlin
8a1459665d No real changes, just get rid of _wxMenuAt() in wxOSX menu code.
The _wxMenuAt() function was totally unnecessary and duplicated the existing
wxMenuBar::GetMenu() so simply remove it and use GetMenu() instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-19 15:02:38 +00:00
Vadim Zeitlin
4027f0d759 Fix initial gradient point calculation in wxOSX.
This fixes the bug introduced in r63879 which used the wrong indices into the
stops array resulting in visual artefacts in wxAUI, for example (and also
possible crashes due to accessing out of bound array elements).

Closes #12784.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-19 15:02:31 +00:00
Vadim Zeitlin
1c7ce07347 Preserve wxSlider value when changing its range in wxOSX too.
This fix is similar to r66368 for wxMSW and preserves the slider value when
its range changes. This is necessary because while the underlying native
control value doesn't change when the range is, the logical value of wxSlider
does change if it must be inversed as this depends on the range.

See #12765.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-19 14:08:42 +00:00
Jaakko Salli
f74ab0041b Make wxOwnerDrawnComboBox sorting identical to the MSW sorting (same as wxComboBox)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-17 12:23:34 +00:00
Jaakko Salli
ffb9247a85 Add wxComboBox-compatible Popup() and Dismiss() functions in wxComboCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-17 12:08:55 +00:00
Jaakko Salli
94daedc804 Add enough default arguments to one wxOwnerDrawnComboBox ctor so it can be consructed using only two arguments, same as the wxComboBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-17 11:50:54 +00:00
Jaakko Salli
65d30b7950 Mostly change the wxOwnerDrawnComboBox text value using ChangeValue() instead of SetValue()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-17 11:39:38 +00:00
Jaakko Salli
0306e73e63 Make the wxComboCtrl's wxTextEntry interface more complete and consistent. All text is no longer selected on SetValue(), but only when user selects an item from the drop-down list.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-17 11:20:50 +00:00
Robin Dunn
708cc39462 Use a " " (space) for the menu item if an empty string is used for an item in a wxChoice, in order to avoid an assert in wxMenuItem.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-17 00:56:26 +00:00
Jaakko Salli
2debe2b120 Removed a return statement from void function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-16 19:25:31 +00:00
Jaakko Salli
eae20c901b Resolve ambiguity with wxOwnerDrawnComboBox::Clear(), virtual method which is derived from two base classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-16 18:13:43 +00:00
Jaakko Salli
bd0fa687b6 In wxBitmapComboBox dtor, call DoClear() instead of ambiguous Clear()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-16 18:08:16 +00:00
Jaakko Salli
9ff4b6ccd9 Override wxTextEntry::GetSelection(long *from, long *to) in wxOwnerDrawnComboBox to resolve virtual method hiding issues
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-16 18:07:05 +00:00
Jaakko Salli
fda6279358 Instead of having wxComboCtrl mimic wxTextEntry interface, make it actually inherit from the class and implement functions to redirect to the embedded wxTextCtrl. This allows us to simplify the code and get rid of the dirty trick of directing wxComboCtrl's validator to the embedded wxTextCtrl. Also see #12779, which issue 1 is fixed by this change.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-16 17:21:49 +00:00
Jaakko Salli
25199f9859 Document how the sign is omitted from wxFloatProperty's displayed value when it is effectively zero (closes #12738).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-16 16:12:55 +00:00
Vadim Zeitlin
0538419f9e Initialize wxLogWindow::m_pLogFrame in ctor to avoid (rare) crash.
If the log frame creation itself generates log messages, the code using
wxLogWindow could crash because its m_pLogFrame member variable wasn't
initialized yet at this moment.

Do set it to NULL initially now to avoid this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-15 13:36:44 +00:00
Vadim Zeitlin
66f7556189 Compilation fixes for wx{X11,GTK1,Motif} after making ref data non copyable.
Don't use wrong compiler-generated copy ctors in the other ports neither (see
r66371..66373 for wxGTK fixes). This fixes compilation after r66374 without
reducing functionality but just making it more clear where it is missing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-15 12:04:13 +00:00
Vadim Zeitlin
10c49955ad Compilation fix for wxMotif PCH build.
We need to include wx/unix/utilsx11.h even when using PCH to get
wxCharCodeXToWX() declaration.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-15 12:04:02 +00:00
Vadim Zeitlin
806b2e1692 Update accelerator unit test to pass after recent changes.
Changes of r66379 broke the unit test as wxAcceleratorEntry::Create() now
requires the TAB to be present in the string passed to it (again).

Update the test to make it pass.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-15 12:03:54 +00:00
Vadim Zeitlin
6fc7a1ad1c Don't pass strings not containing accelerators to ParseAccel().
Check for the presence of accelerator part in the string passed to
wxAcceleratorEntry::Create() and don't call ParseAccel() at all if it's not
there. This avoids the spurious warnings about unrecognized accelerators when
creating menu items that don't have any accelerators at all.

Also update wxAcceleratorEntry::FromString() documentation to mention that
the new code should pass just the accelerator to this function and that it
only accepts full menu item labels for compatibility.

Closes #12770.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-15 11:18:42 +00:00
Jouk Jansen
a67c2d4161 Include compilation of tests for OpenVMS (part2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-15 10:54:47 +00:00
Jouk Jansen
38e5440573 Include compilation of tests for OpenVMS (part1)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-15 09:51:48 +00:00
Vadim Zeitlin
377c1ba438 Return false, not NULL, from a function returning bool.
Fix a warning (which might be an error with some compilers) about returning
NULL from bool wxRichTextImageBlock::DoMakeImageBlock() function.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-14 18:44:04 +00:00
Vadim Zeitlin
8f6f3a71d8 No real changes, just add a cast to fix a warning.
Fix warning about implicitly converting -1 to CGKeyCode when building wxOSX
with 10.4 SDK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-14 18:43:57 +00:00
Vadim Zeitlin
fd08ccd246 Make wxRefCounter non copyable.
wxRefCounter copy ctor was wrong as the new object had the same reference
count as the old one instead of starting its life with reference count set to
1 as any new object should.

While we could fix its copy ctor, it seems to be better to forbid copying
wxRefCounter objects at all because the semantics of doing this is not obvious
and the compiler-generated copy ctor in the derived classes often doesn't do
what the code using it expects it to do, as was discovered by making
wxRefCounter non copyable: see the fixes in the previous commits.

To uncover all such bugs, make wxRefCounter and classes deriving from it non
copyable. If this uncovers more problems, they should be fixed by implementing
copying properly (and explicitly) in the derived classes.

Closes #12768.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-14 18:43:49 +00:00
Vadim Zeitlin
f9b4d680d7 Fail in CloneGDIRefData() instead of implementing it incorrectly in wxOSX.
wxIcon and wxMetaFile implemented CloneGDIRefData() using copy ctors of the
corresponding ref data classes but the copy ctors were either wrong (for
wxIconRefData as using it would result in messing up IconRef reference count)
or had wrong semantics (wxMetafileRefData copy ctor performed shallow copy
only while CloneGDIRefData() supposes a deep copy is done).

Replace the wrong implementations of these functions with assert that will be
triggered if they are ever used (which doesn't seem to be the case so far).

See #12768.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-14 18:43:39 +00:00
Vadim Zeitlin
fc684792c6 Don't use implicit wxBitmapRefData copy ctor in wxGTK code.
wxBitmapRefData didn't have a proper copy ctor but the code in wxGTK wxBitmap
implementation used it nevertheless and then manually patched the newly copied
object to avoid double pointer deletion and other unpleasantness.

Make the code more obviously correct by not using (nor providing) copy ctor at
all. There are no real changes otherwise.

See #12768.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-14 18:43:32 +00:00
Vadim Zeitlin
51bf928d02 Fail instead of crashing in wxGTK wxCursor::CloneGDIRefData().
CloneGDIRefData() used wxCursorRefData copy ctor which wasn't implemented
correctly and simply copied its internal m_cursor member without incrementing
its reference count which resulted in a crash when it was then dereferenced
twice.

Unfortunately there doesn't seem to be any simple way to clone GDK cursors but
as this should be something only rarely (if ever?) needed, simply don't
implement CloneGDIRefData() at all for now and just leave an assert in it if
it's ever really called. Also don't define wxCursorRefData copy ctor at all as
it can't be done correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-14 18:43:25 +00:00
Vadim Zeitlin
5cb160c564 Improve wxImage handlers documentation, especially ownership aspect.
Correct wxImage::RemoveHandler() documentation which was plain wrong.

Also mention that the handler will be deleted by wxImage in AddHandler()
documentation.

And add an example of using AddHandler() as well as fix the broken text in
wxInitAllImageHandlers() description.

Closes #12772.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-14 18:43:17 +00:00
Vadim Zeitlin
d383f40e7b Preserve value when changing range of inverted wxSlider in wxMSW.
The logical value of wxSlider was changed when its range was changed in wxMSW
if the slider had wxSL_INVERSE style because the logical value was actually
computed using the range and the actual physical control value and we forgot
to update the latter when changing the range.

Do update it now in SetRange() to fix this.

Also add unit tests checking for this and, more generally, for other
operations with inversed sliders.

Closes #12765.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-13 18:10:02 +00:00
Jaakko Salli
bac635ede2 Have wxPropertyGrid::DoubleToString() to also take comma into account as a decimal separator. In addition, the function now returns target wxString (makes writing tests easier).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-13 16:07:49 +00:00
Jaakko Salli
0b4e4c3937 Added code to remove sign from zero in wxPropertyGrid::DoubleToString(). Fixes #12738.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-11 11:57:26 +00:00
Stefan Csomor
954c66fafc changing compositing mode for Clear, see #12756
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-11 11:48:38 +00:00
Stefan Csomor
54ea28348c adding support for layout coordinates via insets from framecoordinates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 15:46:12 +00:00
Stefan Csomor
2a2064f895 fixing redraw debugging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 15:41:33 +00:00
Stefan Csomor
9cb50d3a2c attempt at making the line continuation characters stay correct
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 13:28:32 +00:00
Stefan Csomor
b7e15982d3 updating files list for iphone opengl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 10:11:53 +00:00
Stefan Csomor
9b0fdac056 updated comment was not saved in former commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 09:45:54 +00:00
Stefan Csomor
bacea49718 updated comment was not saved in former commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 09:10:02 +00:00
Stefan Csomor
5397ea5338 reverting content area calculation for iphone as translucent status bars get ignored otherwise
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 08:53:11 +00:00
Stefan Csomor
edb31724bc fixing osx iphone build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-04 13:34:19 +00:00
Stefan Csomor
0ef18b97a3 guarding compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-04 13:33:45 +00:00
Stefan Csomor
f400feb528 adapting inheritance to other osx ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-04 13:33:20 +00:00
Stefan Csomor
b213ba752c guarding against non-implemented parts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-04 13:32:51 +00:00
Vadim Zeitlin
ef57807f27 Rename wxGenericDirCtrl::ExpandDir() to PopulateNode().
This function doesn't really expand anything (unlike CollapseDir()) so give it
a better name while keeping the old one too for compatibility.

See #12735.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 14:12:23 +00:00
Vadim Zeitlin
81ebc04192 Set the window in focus event sent by wxComboCtrl correctly.
The window parameter wasn't copied correctly in the forwarded event. Fix this
and avoid future problems of the same kind by using the copy ctor for creating
the new event and then override the fields that we need to change from the
original event instead of recreating the new event from bits and pieces of the
original one.

Closes #12741.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 14:00:31 +00:00
Vadim Zeitlin
cae374efb9 Update AUI bitmaps when its colours change.
Extract the bitmaps initialization in wxAuiDefaultDockArt::InitBitmaps() and
call it from SetColour() to ensure that the bitmaps are updated when the
colour scheme changes.

Closes #12532.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:40:28 +00:00
Vadim Zeitlin
a310c91c7c No changes, just clean up duplicate colour functions in wxAUI.
Reuse wxcolour::AlphaBlend() and ChangeLightness() methods instead of
duplicating them in wxAUI-specific wxAui{Blend,Step}Colour().

See #12532.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:40:23 +00:00
Vadim Zeitlin
c72fa1cd62 Update the directory icon in wxGenericDirCtrl::ExpandDir().
Calling ExpandDir() to notify the control that a new item was added in a
previously empty directory didn't work as wxTreeCtrl::SetItemHasChildren()
wasn't called.

Fix this by moving SetItemHasChildren() to ExpandDir() from OnExpandItem(), it
must be always done and not just in response to an interactive action.

Closes #12735.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:40:15 +00:00
Vadim Zeitlin
c892ae145c No changes, just clean up duplicate colour functions in wxSearchCtrl.
Use wxColor::ChangeLightness() instead of private wxStepColour() that
duplicates it.

Close #12744.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:40:08 +00:00
Vadim Zeitlin
4776c0b783 Optimize pixels rotation in wxImage::Rotate90().
Rotate the image by entire strips instead of doing it pixel by pixel.

This seems to result in about 50% performance gain.

Closes #12739.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:40:03 +00:00
Vadim Zeitlin
944f641cf9 Don't require leading TAB in wxAcceleratorEntry::FromString().
FromString() should parse string returned by ToString() successfully but this
wasn't the case because the accelerator parsing functions always insisted on
having a TAB in the string.

Fix this, document the string format and add a unit test checking for the
correct behaviour.

Closes #12745.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:39:57 +00:00
Vadim Zeitlin
238ecc7c52 Don't try to extract accelerators from menu items which don't have any.
We don't need to call wxAcceleratorEntry::Create() in wxMenuItem::GetAccel()
if the menu item doesn't have any accelerator at all, i.e. if there is no TAB
in its label.

Calling wxAcceleratorEntry::Create() is useless and won't work correctly any
more when Create() is updated to allow passing it strings without TAB in them
in the next commit.

See #12745.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:39:48 +00:00
Vadim Zeitlin
afa111d52c Fix wxRect::SetRightTop() which set the wrong corner.
SetRightTop() erroneously forwarded to SetTopLeft() instead of SetTopRight().

Closes #12746.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:39:43 +00:00
Vadim Zeitlin
9d6196a91e Mention in wxHashSet documentation that its contents is not sorted.
The documentation gave a wrong impression that this class was a std::set
replacement which it isn't.

See #12727.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-03 12:39:34 +00:00
Stefan Csomor
8915e40ce9 fixing missing return value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-01 07:42:13 +00:00
Paul Cornett
b61cc19c06 merge libpng 1.4.4 to trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-30 18:41:25 +00:00
Paul Cornett
818eb2767c add src/gtk1/mnemonics.cpp to files.bkl and rebake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-30 18:01:53 +00:00
Jouk Jansen
9359199632 Add mnemonics to wxGTK1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-30 10:19:29 +00:00
Stefan Csomor
c46d050368 adding standard menu items for cocoa, adding translation macro to menulabels, fixes #12732
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-30 09:59:11 +00:00
Stefan Csomor
eeb7bdd0e9 adding defines to support building against 10.4u.SDK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-29 08:57:00 +00:00
Vadim Zeitlin
7e0b0eb38f Don't compare invalid iterators in wxCommandProcessor code.
Comparing invalid iterators results in an assert failure in STL build.

We might also change wxList::compatibility_iterator::operator==() to allow
comparing invalid iterators (which should be different from all the other ones
but what about comparing two invalid iterators?) but it would probably be
better to get rid of all uses of compatibility_iterator in the code instead in
the long term.

Closes #12730.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-28 15:14:49 +00:00
Vadim Zeitlin
a6c4ae18ba Verify the return value of wxItemContainer::Insert() in the tests.
Check that Insert() returns the index of the last inserted item.

Also document this behaviour for mulit-item renames explicitly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-27 11:34:47 +00:00
Vadim Zeitlin
7612febb93 Fix the return value of wxSimpleHtmlListBox::Insert().
The returned index was off by 1.

Closes #12717.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-27 11:34:40 +00:00
Vadim Zeitlin
68ebe2620f Add wx(Simple)HtmlListBox unit test.
For now just test the wxItemContainer methods.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-27 11:34:34 +00:00
Vadim Zeitlin
ed6480baf5 Document wxSimpleHtmlListBox inheritance from wxItemContainer.
Without wxItemContainer in the docs all the item maintenance methods were
absent from wxSimpleHtmlListBox.

See #12717.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-27 11:34:25 +00:00
Robin Dunn
6a07405963 Move the Mac methods from wxAppConsole to wxApp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-27 08:42:04 +00:00
Robin Dunn
e1134ecfba wxDefaultVideoMode is const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-27 08:40:27 +00:00
Robin Dunn
a3b14191f4 wxPlatformInfo does not derive from wxObject
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-27 08:38:46 +00:00
Jaakko Salli
5569834ddb Fix 100% CPU usage on wxGTK caused by a recent change in wxPropertyGridEditorEventForwarder::ProcessEvent()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-26 17:39:47 +00:00
Vadim Zeitlin
ee90c6b914 Update configure helper scripts to latest versions from GNU project.
The new version (the one we used was 6 years out of date) notably detects 64
bit MinGW platforms correctly which closes #12356.

Also update config.{guess,sub} scripts in 3rd party libraries directories to
bring them all in sync with the main one and ensure that MinGW 64 is supported
by them too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-26 13:31:15 +00:00
Vadim Zeitlin
9c1f960fac Small bug fixes for GetLibraryVersionInfo() changes.
Fix the minor version determination for libtiff which was done wrongly by
r66259 and provide a properly formatted description for Scintilla version.

See #12690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-26 13:31:07 +00:00
Vadim Zeitlin
d3ffaafb37 No real changes, just remove unnecessary const workaround.
The comment about "wxString doesn't having enough const members" was totally
incomprehensible and clearly wrong. Just remove the hack it was explaining.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-26 13:30:43 +00:00
Vadim Zeitlin
6eefca4fb7 Allow wxAutomationObject::GetInstance() create new instance if needed.
When getting an instance of an OLE automation object, it is often useful to
connect to the existing instance if any or start a new one otherwise. Make
GetInstance() behave like this by default while still allowing to use the
wxAutomationInstance_UseExistingOnly flag to reestablish the old behaviour.

Also improve the error reporting in wxAutomationObject.

See #12489.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-26 13:30:37 +00:00
Vadim Zeitlin
27d7687903 No real changes, just use ProgID term instead of incorrect CLSID.
CLSID was used instead of ProgID in several places in the code and the
documentation but they are different things so clear up the confusion.

See #12489.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-26 13:30:25 +00:00
Stefan Csomor
ebb395967e led to build issues with xcode and graphics context
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-25 18:04:01 +00:00
Vadim Zeitlin
ccec90930c Add wxVersionInfo and functions returning it for 3rd party libraries.
Add simple wxVersionInfo class holding the version information.

Also add GetLibraryVersionInfo() static method to wx{JPEG,PNG,TIFF}Handler,
wxStyledTextCtrl and wxXmlDocument classes and wxGetZlibVersionInfo() and
wxGetLibraryVersionInfo() global functions using it.

Closes #12690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-25 00:53:44 +00:00
Vadim Zeitlin
5b70f2de3f Document some previously undocumented wxAboutDialogInfo getters.
See #12690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-25 00:53:30 +00:00
Vadim Zeitlin
2521c1ba6f Mention status bar fields limits under pre-XP MSW systems.
Mention that before comctl32.dll status bar fields were limited to 127
characters only.

See #12709.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-25 00:53:24 +00:00
Vadim Zeitlin
fcf56ee4de Warn that normalizing a valid path may make it invalid sometimes.
Mention the special case of a path without file name and with directory that
normalizes to empty string.

See #10960.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-24 12:43:45 +00:00
Vadim Zeitlin
89a1395ebc Optimize wxImage::Rotate90() by rotating alpha separately.
Bringing the alpha rotation out in a separate loop results in an
approximatively 10% performance improvement.

Closes #12712.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-24 12:43:36 +00:00
Vadim Zeitlin
a6bf0c9533 Add support for negatable command line switches.
Add wxCMD_LINE_SWITCH_NEGATABLE which allows to use a dash after a command
line switch to inverse its meaning (i.e. use "/X-" form). Also add new
wxCmdLineParser::FoundSwitch() allowing to check for whether the switch was
specified in normal or negated form.

Closes #11643.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-24 00:42:53 +00:00
Vadim Zeitlin
94803e4ec8 Rewind the input stream after failing to load image from it.
For seekable streams, don't change the current position when loading image
fails. This allows the subsequent image handlers to succeed during image
format auto-detection even if a previous, erroneously chosen, handler failed.

Closes #12702.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-24 00:42:45 +00:00
Vadim Zeitlin
3f74b7aeb6 Improve error messages from wxImage::LoadFile().
The error given when loading an image file failed was not very useful because
they didn't specify which file exactly we failed to load and also because the
numeric handler type which means nothing at all to the end user (and not much
to the developer) was used.

Use the description of the file format instead and also always give the name
of the file that we failed to load.

Finally, remove the test for file existence: this is one of many reasons why
opening the file could fail and it doesn't make sense to handle it specially,
just let the underlying stream generate the appropriate error message in all
cases.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-24 00:42:35 +00:00
Vadim Zeitlin
737883f20a Skip mouse events outside of item area in wxDataViewCtrl.
Don't consume mouse events outside of the area occupied by the items in the
generic implementation of wxDataViewCtrl as this prevented wxEVT_CONTEXT_MENU
events from being generated.

Closes #12706.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-24 00:42:19 +00:00
Robin Dunn
63a6a75000 Use an enum for the colour/string conversion flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-23 22:14:57 +00:00
Robin Dunn
96b77d60a4 Fixed parameter names. They can't be named "short"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-23 22:14:18 +00:00
Vadim Zeitlin
00bc0d1734 VC6 compilation fix: don't return void values.
Fix VC6 compilation broken by r66237: don't return the result from a void
function, this compiler doesn't support this C++ feature.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-23 13:12:33 +00:00
Vadim Zeitlin
8c3aa3ffb0 Simplify timezone-related code and fix some minor bugs in it.
Try to make the chain of preprocessor checks for different ways of getting
time zone from the CRT more clear.

Also call _tzset() for all MSVC versions, not just MSVC8+ (closes #12700). We
should probably call tzset() for the other compilers too, in fact.

And multiply the timezone returned from ftime() by 60 as it's supposed to be
in minutes and not seconds as needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-23 13:11:10 +00:00
Vadim Zeitlin
a4984245b6 Center task dialog-based wxProgressDialog on the parent window.
wxProgressDialog was created without the parent when using task dialogs so it
was centred on screen and not on its parent as usual. Fix this by explicitly
positioning it so that it's centered over the parent.

Closes #12699.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-23 13:11:02 +00:00
Vadim Zeitlin
bbb03ec995 Deselect all items in wxMSW wxListBox when selection is set to -1.
Even though this behaviour is somewhat counterintuitive, the documentation
mentions that this is what should happen and wxGTK and wxOSX already behave
like this so bring wxMSW in line.

wxListBox::DeselectAll() should probably just call SetSelection(wxNOT_FOUND)
when the item to leave selected is not specified too now.

Closes #12705.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-23 13:10:54 +00:00
Stefan Csomor
79323592eb fixing 64 bit ranger error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 16:38:44 +00:00
Vadim Zeitlin
ff1e36afc0 Initialize time zone information before using it in wxGetTimeZone().
We must call _tzset() before calling _get_timezone() as while this is normally
done implicitly by the other time functions, it might not have been done yet
if create a wxDateTime::TimeZone before calling any of them.

Closes #12700.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 16:18:47 +00:00
Jaakko Salli
b296009869 Have wxPropertyGridEditorEventForwarder::ProcessEvent() return true more often - that is when the event was recognized as being 'handled', and specifically for the case of property editor's button being pressed (fixes #12487).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 14:28:16 +00:00
Vadim Zeitlin
4ed7b5779e Fix wxUniv build after deriving wxStatusBar from wxControl.
wxUniv build was broken since the base class of wxStatusBar was changed from
wxWindow to wxControl in r66226 because it derived twice from wxInputConsumer
now.

Fix this by simply not inheriting wxStatusBarUniv from wxInputConsumer any
more, it already derives from it via wxControl now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 12:51:05 +00:00
Vadim Zeitlin
2a9b583b48 Revert "Always define WXUSINGDLL when compiling Scintilla in shared wx build."
Finally it's unnecessary to define WXUSINGDLL when building wxScintilla
library as it doesn't use the main DLL, it is simply used as part of it.

This reverts r66222 and finally closes #12626.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 12:49:25 +00:00
Vadim Zeitlin
dd53b347de Don't try to center task dialogs under Windows.
This is either unnecessary or doesn't work anyhow (they are always centered on
the parent window) and just results in debug error messages.

Simply don't do anything in wxMessageDialog::Centre() when using task dialog
implementation under MSW.

Closes #12699.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 12:49:07 +00:00
Vadim Zeitlin
8e76e93199 Set the width of the last status bar pane correctly in wxMSW.
The total width of status bar panes must add up to the size of the status bar
as otherwise an extra unwanted border is drawn after the last pane and we did
have this border for status bar with a size grip.

So while we still use the width without the size grip for calculating the
fields widths, pass the width with the size grip to Windows to prevent this
from happening.

Also, don't pretend that the last field stretches up to the status bar edge
when it should end before the size grip and Windows even already helpfully
does it for us.

Closes #12655.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 12:48:47 +00:00
Vadim Zeitlin
dcd223d1d1 Add status bar styles mapping to MSW styles broken by recent changes.
SBARS_SIZEGRIP and CCS_TOP should be added to the normal style, not the
extended one. This restores the behaviour broken by r66227.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 12:48:42 +00:00
Vadim Zeitlin
ef5dbedecf Put WINDRES_CPU_DEFINE in RESFLAGS and not RESCOMP in configure.
WINDRES_CPU_DEFINE is just another resource compiler flag which should be part
of RESFLAGS instead of being added to RESCOMP definition itself. This is not
only more logical but also fixes the problem with matching RESCOMP against
"windres" or "wrc" in wx-config.

See #12356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 12:48:35 +00:00
Vadim Zeitlin
6cab632f32 Make wxChoicebook background transparent.
This fixes the appearance of an empty wxChoicebook used as a child of a
wxNotebook under MSW.

Closes #12503.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:23:21 +00:00
Vadim Zeitlin
26696222ff Deprecate not working wxSplitterWindow::SetSashSize().
Setting sash size to non default value didn't work correctly and didn't make
much sense anyhow as the sash appearance is platform-dependent and current
code for drawing it doesn't work for arbitrary sizes.

Simply remove the possibility to set the sash size.

Closes #12412.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:23:16 +00:00
Vadim Zeitlin
4ccbb8de5c Don't set explicit background colour for wxStatusBar in wxMSW.
Setting the background colour for the status bar explicitly is unnecessary and
probably prevents it from rendering correctly with some themes. Simply remove
the call to SetBackgroundColour() from wxStatusBar::Create().

We should also define Get[Class]DefaultAttributes() in wxStatusBar in the
future.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:23:09 +00:00
Vadim Zeitlin
245f96e890 Don't forbid creating wxSplitterWindow with border style.
Any border specified for wxSplitterWindow was explicitly discarded when
creating it but there doesn't seem to be any reason to forbid it, the original
code probably predated the addition of wxWindow::GetDefaultBorder() which
allowed to have different borders by default for different classes.

In any case, simply remove this code now to allow creating splitters with
borders if so desired.

Closes #12413.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:23:02 +00:00
Vadim Zeitlin
e819ca3aa5 Delete pending objects in wxApp::ProcessPendingEvents() and not ProcessIdle().
Move DeletePendingObjects() call from ProcessPendingEvents() to ProcessIdle()
to ensure that we delete the objects marked for destruction even if the
application is sitting in a tight OnIdle() loop, i.e. if the idle event
handler keeps requesting more events.

Also make sure that the event loop terminates if its OnExit() was called even
if the idle event handler continues to request more events.

Closes #12424.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:56 +00:00
Vadim Zeitlin
86c6fc77e1 Silently ignore timer events from timers which were just stopped.
An assert in wxTimerWndProc() could be provoked by valid user code which
simply started and stopped the timers quickly enough because a WM_TIMER could
have been already generated just before we stopped the timer.

Simply ignore events from unknown timer under assumption that they must come
from the recently stopped ones instead of asserting.

Ideally we'd somehow distinguish between the situation described above and the
really bogus events which could indicate bugs in wx code or a change in
behaviour in a future version of Windows but there is no easy way to do it so
for now just settle for not asserting in normal case.

Closes #10052.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:47 +00:00
Vadim Zeitlin
db6150d59a Refactor wxStatusBar creation in wxMSW to do it in standard way.
Use wxControl-provided CreateControl() and MSWCreateControl() methods to
create the status bar instead of duplicating their code in its Create().

Also translate wx styles to MSW ones in overridden MSWGetStyle() now.

In addition to making the code smaller and more clear, this fixes the
non-respect of the styles specified at status bar creation (e.g. border),
see #12655.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:41 +00:00
Vadim Zeitlin
f771bae35a Derive wxStatusBar from wxControl and not wxWindow.
wxStatusBar is no less a control than wxToolBar and deriving it from wxControl
gives access to convenient native control creation functions under MSW (which
will be used by the next commit).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:36 +00:00
Vadim Zeitlin
c22bbd087a Use status full, not client, size to determine frame client size in wxMSW.
We need to account for the full size of status bar, including potential
borders, when calculating the client size of the frame containing it.

Closes #12697.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:30 +00:00
Vadim Zeitlin
426ebc992b Send page changed event after changing the page in wxMSW wxNotebook.
Update the currently selected page before generating
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED event in wxMSW wxNotebook. This is more
consistent with other ports and more logical as "-ED" events are supposed to
be sent after the action they notify about is completed. And it also allows to
set the focus in this event handler whereas any attempts to do it would have
been disregarded before as changing the active page resets focus.

Notice that this does introduce an incompatibility: calling
wxNotebook::GetSelection() from PAGE_CHANGED event handler now returns the new
page and not the old one as before. Again, this is more logical and more
consistent.

Closes #12688.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:25 +00:00
Vadim Zeitlin
1907df9d5b Use correct wxDEBUG_LEVEL value when building wxscintilla library.
wxScintilla code uses wxVector<> which brings in wxDEBUG_LEVEL-dependent code
so we must use the wxDEBUG_LEVEL value consistent with the rest of the library
when building it.

Simply pass wxDEBUG_LEVEL definition on the compiler command line if it's
different from the default.

Closes #12626.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:17 +00:00
Vadim Zeitlin
02c9115ba8 Always define WXUSINGDLL when compiling Scintilla in shared wx build.
We need WXUSINGDLL even in monolithic build because Scintilla references wx
debugging functions (wxOnAssert(), wxTheAssertHandler &c) which still must be
seen as being exported from the (monolithic) DLL in this case.

See #12626.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:07 +00:00
Vadim Zeitlin
aa6b8882a4 Correct wxFont::GetFamily() unit test to test for wxFONTFAMILY_DEFAULT.
GetFamily() returns wxFONTFAMILY_DEFAULT and not wxFONTFAMILY_UNKNOWN since
r65670.

Correct the test to handle wxFONTFAMILY_DEFAULT as allowed value.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-21 13:00:13 +00:00
Vadim Zeitlin
f9ee3f4710 Revert r66070: "Unload bogus XRC resources in "garbage" unit test."
This change is not needed any longer after r66219 which fixed the real
underlying problem, i.e. that attempting to load an invalid XRC file resulted
in failures when loading all subsequent XRC files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-21 13:00:06 +00:00
Vadim Zeitlin
9fc5a47ce6 Don't keep entries for XRC resources that failed to load in wxXmlResource.
Attempting to load a resource that couldn't be loaded resulted in
wxXmlResource::Load() returning false for this and _all_the_subsequent_ calls
to it because each call to Load() reattempted to reload all resources,
including the one(s) that failed to load initially.

Instead, try to load just the resource(s) that we should load right now and
ignore all the other ones. Also, don't add entries for the one(s) that we fail
to load.

This fixes the unit test failures in the XRC test case which was affected by
the test checking that XRC couldn't be loaded from garbage that ran before it.
It also makes the code simpler by ensuring that wxXmlResourceDataRecords
elements always have a valid wxXmlDocument associated with them.

Also clean up the code: use wxScopedPtr instead of manually deleting pointers
and reorganize #if checks to be easier to follow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-20 23:53:34 +00:00
Vadim Zeitlin
f822acceee Don't consider extra ".." an error in wxFileName::Normalize().
The path being normalized could have come from user and there doesn't seem to
be any point in complaining about too many ".."s in it when we can handle them
correctly instead.

So simply ignore the extra ".."s for the absolute paths and keep them
unchanged for the relative ones instead of returning an error.

See #10960.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-20 23:53:28 +00:00
Jaakko Salli
780cccd730 Reworked wxSystemColourProperty::StringToValue() to use wxColour::Set() instead of doing string-to-colour conversion by itself. This adds support for HTML-colours, among other things (closes #12696).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-20 11:58:54 +00:00
Robin Dunn
a90e69f70f Fix some bad parameter names, add missing methods, add missing classes, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-19 07:57:19 +00:00
Robin Dunn
b702a83386 Add a SetSize to wxSizeEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-19 07:51:15 +00:00
Vadim Zeitlin
7dbd713731 Improve documentation about handling C++ exceptions in wx programs.
Try to explain the different exception handling strategies more clearly in the
overview and also update OnUnhandledException() documentation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-18 14:10:15 +00:00
Vadim Zeitlin
8b3eb4a069 Check wxDateTime components validity more rigorously.
Check that the provided day is strictly positive and also that the month is in
valid range: while it should always be, considering that it's an enum element,
in practice people often cast ints to wxDateTime::Month with potentially fatal
results. Catch this with an assert in wxDateTime::Tm::IsValid().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-18 12:41:13 +00:00
Vadim Zeitlin
ca96978a98 Explicitly include "wx/dynlib.h" from src/msw/combobox.cpp.
This header was only included implicitly via wx/msw/uxtheme.h and thus the
code failed to compile with wxUSE_UXTHEME==0 but wxUSE_DYNLIB_CLASS==1.

See #12664.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-18 12:41:07 +00:00
Paul Cornett
96a3acb72c remove const from by-value return type, it's useless
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-17 05:57:21 +00:00
Vadim Zeitlin
a302a5ca58 Remove obsolete warning from wxMenuBar::GetTitle() documentation.
This method can be used for menu bar entries also since the previous commit.

Do mention that SetTitle() can't be used to change a menu bar menu title
however.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-17 01:22:17 +00:00
Vadim Zeitlin
7ee9a64bd6 Simplify wxMSW wxMenuBar title management.
Store the titles of the menu bar menus in the menu objects themselves. This
makes wxMenu::GetTitle() return the expected result for them (which also fixes
the current unit test failures for wxMSW) and makes wxMenuBar code simpler.

This removes the wxMenuInfo class which existed for XTI purposes only but as
it was apparently unfinished and MSW-specific it shouldn't be a big loss.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-17 01:20:50 +00:00
Vadim Zeitlin
5d4510dc48 No real changes, just minor cleanup of wxImage code.
Make more local variables const. Use consistent spacing. Don't use needless
comparison with NULL. Don't avoid not using double negation.

See #12682.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-17 01:20:44 +00:00
Vadim Zeitlin
0fe7cd1da4 Don't pass a bool to wxImage::MakeEmptyClone() which takes an enum.
Correct the changes of r66167 which accidentally left a call to
MakeEmptyClone() using its previous signature.

See #12682.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-17 01:20:38 +00:00
Vadim Zeitlin
7bc0ff8672 Correct form of mnemonics returned by wxGTK wxMenu::GetTitle().
wxMenu::GetTitle() returned a string in GTK+ format (i.e. using underscores
instead of ampersands) instead of the expected wx one.

This is, of course, the right thing to do and it also fixes
wxMenuBar::FindMenuItem() as a side effect.

Closes #12672.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:38:53 +00:00
Vadim Zeitlin
21fc588c66 Emphasize that wxUSE_DYNLIB_CLASS shouldn't be disabled in wxMSW.
Mention in the setup.h comment that wxDynamicLibrary is used in a lot of
places internally and disabling it can result in a loss of a lot of important
functionality.

See #12664.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:38:44 +00:00
Vadim Zeitlin
14ca3a3b0e Add more checks for wxUSE_DYNLIB_CLASS to wxMSW.
Compilation fixes for wxApp and wxComboBox for wxUSE_DYNLIB_CLASS==0.

See #12664.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:38:38 +00:00
Vadim Zeitlin
c929ad9141 Correct checks for wxUSE_PRINTING_ARCHITECTURE and wxUSE_ENH_METAFILE.
Compilation fixes for building without one or both of these symbols.

See #12664.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:38:32 +00:00
Vadim Zeitlin
80e13ad372 Avoid asserts due to not overriding OnGetItemText() in VirtListCtrlTestCase.
A virtual list control must override wxListCtrl::OnGetItemText() method and
wxMSW native implementation asserts if this is not the case (the generic one
should arguably do it as well).

Avoid the asserts by providing a dummy implementation of OnGetItemText() in
the unit test.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:38:26 +00:00
Vadim Zeitlin
a7dc53953b Add an explicit SetFocus() call to fix wxTreeCtrl unit test.
Fixing the implicit focus grabbing by wxTreeCtrl::SelectItem() in r65905 broke
its unit test case as the simulated key event was not delivered to wxTreeCtrl
itself any more.

Fix this by simply setting the focus to the tree explicitly before sending it
any key strokes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:38:19 +00:00
Vadim Zeitlin
a48cf5e2d3 Correct wxMSW wxToolTip behaviour for wxRadioBox items tooltips.
The assert added in r66053 checking that we couldn't have tooltips for child
windows if we didn't have the tooltip for the main one turned out to be wrong,
at least in wxRadioBox case it's perfectly possible to have the tooltips for
the individual radio buttons without having one for the box itself.

Replace the assert with a simple if check.

This fixes a unit test failure in RadioBoxTestCase.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:38:13 +00:00
Vadim Zeitlin
6ab66823d8 Don't use some "recent" C++98 features not supported by VC6.
Don't return void values nor redeclare the same variable in for loops to fix
VC6 compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:38:06 +00:00
Vadim Zeitlin
496dbbe76e No changes, just refactor common code in wxImage cloning functions.
Extract code common to several wxImage methods creating new images based on an
existing one in a new MakeEmptyClone() method.

Closes #12682.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:37:59 +00:00
Vadim Zeitlin
e4f54cce1e Fix crashes in wxDateTime::ParseDate() for some invalid dates.
Parsing an incomplete date with nothing but whitespace and/or date delimiter
characters at the end crashed as we happily went beyond the end of string.

Fix this by not using a loop which didn't check for the iterator validity.

Closes #12685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-16 22:37:52 +00:00
Jouk Jansen
3e90629b6b Update OpenVMS makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-15 08:52:56 +00:00
Vadim Zeitlin
a24b341aea VC6 compilation fix in wxDIB::Create().
Deal with the lack of scope around variables declared inside the for loop in
this compiler, previously it gave "error C2360: initialization of 'x' is
skipped by 'case' label" message and also complained about redefinition of 'x'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-15 00:22:01 +00:00
Vadim Zeitlin
806f8df360 Fix incorrect use of word "alternative" in the documentation.
There can't be only one alternative.

Closes #12681.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-15 00:11:21 +00:00
Vadim Zeitlin
5a1d70f925 Restore code for closing inherited file descriptors in the child.
The code closing all file descriptors inherited from the parent in the child
process created by wxExecute() was  removed in r57324 by mistake (probably
due the fact that its meaning was poorly explained) but we still do need to do
this, of course, to avoid descriptor "leaks" (e.g. the parent couldn't really
close any of them).

Restore the code for closing all unneeded file descriptors in the child in
slightly modified form and add a comment pointing to an URL explaining how to
do it better in the future.

Closes #12636.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-14 14:04:44 +00:00
Vadim Zeitlin
3b81609771 Fix spurious errors when writing to the child process stdin under Unix.
Since the child pipe was made non-blocking in r65993, it became possible to
write to child process without deadlocking when the pipe became full. However
this still resulted in an error from wxFileOutputStream as it didn't handle
EAGAIN returned from write() any differently than any other error, even though
it is an expected situation in this particular case.

Change Unix wxExecute() to use wxPipeOutputStream which ignores EAGAIN unlike
wxFileOutputStream to fix this.

See #12636.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-14 14:04:37 +00:00
Vadim Zeitlin
f895c3fce2 No real changes, just reamed HAS_PIPE_INPUT_STREAM.
Renamed the symbol indicating whether pipe-based streams are available from
HAS_PIPE_INPUT_STREAM to HAS_PIPE_STREAMS as it's not really input-specific.

See #12636.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-14 14:04:27 +00:00
Vadim Zeitlin
65fe93d8a5 Add wxFile::{Get,Clear}LastError() functions.
Remember the errno of the last file operation instead of just remembering
whether there was an error or not.

See #12636.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-14 12:09:59 +00:00
Vadim Zeitlin
0547ad09cc Handle image hot spot in wxImage::Rotate180().
Set the hot spot coordinates correctly for the image returned from
Rotate180(), just as it's already done by Rotate90().

Closes #12680.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-14 12:09:51 +00:00
Vadim Zeitlin
8524dec372 Add wxImage::Rotate180() function.
Closes #12679.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-14 01:02:35 +00:00
Vadim Zeitlin
000c2be40d Handle hot spots in wxImage::Rotate90().
Set hot spot coordinates for the rotated image if the original one had them.

Also handle the case when the source image has both alpha and mask correctly.

Closes #3680.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-14 01:02:27 +00:00
Vadim Zeitlin
f8314f3c20 Don't use standard menu ids in the unit test to avoid Mac problems.
wxOSX rearranges the standard menu items such as wxID_EXIT and wxID_ABOUT and,
for the former, changes its text to "Quit", so don't use them in the menu unit
test which expects to find the items in the menus to which they were added and
exactly with the labels used when adding them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-13 17:13:29 +00:00
Vadim Zeitlin
42b4e5cd2a Don't put cursor at the end of wxGridCellEnumEditor control.
Putting the cursor to the end of the control when the editing starts doesn't
make much sense as this should be the default behaviour anyhow and, worse,
this results in an assert under wxMSW where a read-only wxComboBox doesn't
have any cursor to move.

Closes #12446.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-13 15:03:33 +00:00
Vadim Zeitlin
18198aaea2 Initialize scrollbar positions in wxGTK correctly.
The scrollbar positions stored in wxWindow::m_scrollPos were not initially
correct in wxGTK because wxScrollHelper::SetScrollbars() didn't update them
and only set the values of the underlying GtkAdjustments themselves. This
resulted in filtering out of the first scroll event as the code (wrongly)
believed that the scrollbar position hadn't changed.

Fix this by setting m_scrollPos to the real scrollbar positions.

Closes #12468.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-13 15:03:26 +00:00
Vadim Zeitlin
681694bca9 Add a unit test checking selection updating in virtual wxListCtrl.
Verify that the selection is updated correctly after the number of items in
the control is decreased.

See #12378.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-13 15:03:20 +00:00
Vadim Zeitlin
0231d18f1a Don't assert if config file contains an invalid boolean value.
Asserts should be only triggered by programming errors, not by user actions,
and the assert checking that the value is either 0 or 1 in
wxConfigBase::DoReadBool() could happen if the user edited the file and put a
wrong value into it.

Replace the assert with a warning message.

See #11437.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-13 15:03:10 +00:00
Vadim Zeitlin
65571ec7bf Add a beginning of wxMenu unit test.
Test wxMenu and wxMenuBar item search and counting functions.

See #12672.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-13 15:03:02 +00:00
Vadim Zeitlin
553d672896 Make menu operations always work with "Test" menu in the sample.
Some tests in the "Menu" menu of the menu sample worked with the "Test" menu
while others used the last one ("Help" initially but possibly something else
if the test commands from "Menubar" menu were used).

Harmonize all menu commands to use the "Test" menu now.

See #12668.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-13 15:02:50 +00:00
Vadim Zeitlin
f71adb5029 Fix resizing of wxGrid columns when they were reordered.
The column resizing code in wxGrid didn't take account of the fact that the
column positions and indices could be different. Correct it by inserting calls
to wxGrid::GetColAt() and GetColPos() in a new wxGridOperations::GetLineBefore()
method.

Closes #11984.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-13 15:02:42 +00:00
Jouk Jansen
76d23441fc Update SETUP for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-12 07:15:46 +00:00
Michael Wetherell
948c6134e7 Use wxFS_SEEKABLE flag loading images.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-11 15:51:09 +00:00
Vadim Zeitlin
f32848c53f Improve check for ASCII locale in wxGTK initialization code.
Use wxFontMapper::GetEncodingFromName() to check if the current locale
encoding is ASCII instead of just comparing the name with "US-ASCII" which is
not the name used by most platforms (e.g. current Linux systems call this
encoding "ANSI_X3.4-1968").

This avoid creating a wxCSConv object for ASCII encoding unnecessarily on
startup.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-11 12:09:30 +00:00
Vadim Zeitlin
6c4d607e60 Initialize wxCSConv immediately instead of deferring it.
Deferred initialization code was not MT-safe and just wasn't that useful
anyhow because it is rare to create a wxCSConv object and not use it
afterwards.

Remove the deferred initialization logic and create the real conversion used
by wxCSConv immediately in its ctor.

Also improve the comments by clearly explaining the possible values of
wxCSConv::m_name and m_encoding.

Closes #12630.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-11 12:09:22 +00:00
Vadim Zeitlin
93fdbfb70d Fix typo in error message given if wxUSE_CAIRO is undefined.
Replaced the wrongly copy-and-pasted wxUSE_BUTTON with wxUSE_CAIRO.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-11 12:09:13 +00:00
Robin Dunn
f2e4cf3dc6 No docs yet, just the bare interace so we can get XML for Phoenix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-11 04:09:09 +00:00
Robin Dunn
033b1b9413 Fix a parameter type and add some missing const keywords
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-11 01:29:14 +00:00
Vadim Zeitlin
87f528f15b Disable unit tests which can't work in ANSI build.
Disable unit tests involving operations (such as conversions between UTF and
anything but plain ASCII) not available in ANSI build.

This fixes the test suite for non-Unicode build under Unix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:53:49 +00:00
Vadim Zeitlin
716ee1223e Use wxString::To8BitData() instead of mb_str() to handle NULs correctly.
In ANSI build wxString::mb_str() returns a pointer to the internal wxString
data directly instead of a buffer with a proper length, so it provides access
to the part of the string before the first embedded NUL only.

Use To8BitData() which always returns the buffer of the correct size in all
builds.

The open question remains whether mb_str() should be changed to return a (non
owned) buffer and not just a pointer in ANSI build. This would make
manipulating strings with embedded NULs safer but mb_str() would be less
efficient and less compatible.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:53:40 +00:00
Vadim Zeitlin
23231f1c71 Fix wxString::{Before,After}{First,Last} unit test for ANSI build.
The test used a wide character constant and so didn't work in ANSI build. Use
an ASCII string there now while still keeping the original version in Unicode
build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:53:34 +00:00
Vadim Zeitlin
f7d83f24fb Don't check for wxDF_UNICODETEXT support in ANSI builds.
wxDF_UNICODETEXT clipboard format can't be even constructed without provoking
an assert in ANSI build of wxGTK, so avoid using it, we don't support it
anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:53:27 +00:00
Vadim Zeitlin
8aab23a129 Initialize paragraph descent in wxRichTextParagraph::Layout().
This variable was used as the initial value for the descent but was never
initialized, so the descent computation could be completely wrong.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:53:22 +00:00
Vadim Zeitlin
2c032a5d71 Don't crash in wxGUIEventLoop::Exit() if not running in wxX11.
The implementation of wxEventLoop::IsRunning() has changed since this code was
written and it doesn't check for m_impl != NULL any more. Because of this,
calling Exit() for an active but not running event loop resulted in a crash in
wxX11.

Fix this by doing nothing in this case. This seems better than asserting as
the event handling code exits the loop if an event handler throws an exception
and the loop might not be running in this case yet (events could be processed
because of a wxYield() call).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:53:15 +00:00
Vadim Zeitlin
04a8da5f57 Implement bitmap mask copying in wxX11.
Copy the mask pixmap properly in wxX11, otherwise copying masks resulted in
freeing the same pixmap twice and an X error.

This fixes the bitmap unit test for wxX11.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:53:08 +00:00
Vadim Zeitlin
5f480c0bf1 Don't test for DC validity in wxX11 wxDC text extent functions.
The code in GetTextExtent() and GetChar{Width,Height}() works fine even for
non-initialized wxMemoryDC and the ellipsization unit test relies on this
working so simply remove the asserts which resulted in the test failures.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:59 +00:00
Vadim Zeitlin
bb1b20f1a9 Disable measuring context unit test for wxX11.
wxCairoRenderer::CreateMeasuringContext() is only implemented for wxGTK so the
test fails under other ports when using Cairo. Disable it for wxX11 for now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:52 +00:00
Vadim Zeitlin
711a481223 Use Cairo for wxGraphicsContext in wxX11.
Check for Cairo in configure for wxX11 too.

Fix compilation of wxCairoContext for non-{GTK,MSW} platforms.

Also make wxUSE_CAIRO a "normal" option, i.e. add it to all wx/setup.h files
instead of defining it as 1 unconditionally for wxGTK and 0 for everything
else.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:45 +00:00
Vadim Zeitlin
ac98aec510 Disable unit test for wxColour alpha under wxX11.
wxX11 doesn't support alpha component of wxColour currently.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:35 +00:00
Vadim Zeitlin
1f1dee6b0d Fix signed/unsigned comparison warnings in wxUniv wxNotebook.
Recent replacement of size_t wxNotebook::m_selection with int
wxBookCtrlBase::m_selection resulted in appearance of many warnings in wxUniv
wxNotebook. Fix them by removing some now unnecessary casts between int and
size_t and adjusting the remaining ones.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:29 +00:00
Vadim Zeitlin
7822ffb1de Add #if checks fixing minimal wxGTK build.
Check for functions availability before using them. This fixes compilation of
wxGTK with all features disabled.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:22 +00:00
Vadim Zeitlin
357f4c818d Fix harmless unused parameter warnings in minimal build.
No real changes, just add some wxUnusedVar() to avoid warnings about
parameters unused in some non-default build configurations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:17 +00:00
Vadim Zeitlin
f422aafede Don't exclude a bunch of wxDir methods when wxUSE_LONGLONG==0.
The #endif part of a #if wxUSE_LONGLONG check was incorrectly positioned and
excluded the definition of several wxDir methods not related to wxLongLong
when wxUSE_LONGLONG was 0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:10 +00:00
Vadim Zeitlin
9ce5cf09c2 Fix wxGLCanvas compilation with wxUSE_PALETTE==0.
This fixes compilation problems with the minimal build of wxGTK and will make
removing palette support in the future simpler.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:04 +00:00
Vadim Zeitlin
6d61520df3 Fix wxStandardDialogLayoutAdapter compilation with wxUSE_BUTTON==0.
This class probably should not be compiled in at all in the minimal build but
in the meanwhile just add #if checks around its button-related parts.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:51:57 +00:00
Vadim Zeitlin
ac04aa9943 Make wxBitmap::ConvertToDisabled() available in all ports.
This method was defined in wxBitmapBase which is not used by wxMSW (and wxOS2)
so it wasn't available there. Move the definition of the method inline and
reuse it for all ports, making it part of either wxBitmapBase or wxBitmap as
appropriate.

This is clearly ugly but we still have no good solution for deriving wxBitmap
from wxBitmapBase in wxMSW as it already inherits from MSW-specific wxGDIImage
there.

Also document that ConvertToDisabled() is only available when wxUSE_IMAGE==1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:51:51 +00:00
Vadim Zeitlin
82302ad45a Disconnect "hide" menu signal to fix menu destruction in wxGTK.
The "hide" signal handler was triggered when destroying a sub-menu (even if it
was not shown at this time). Disconnect it to avoid asserts due to attempts to
generate an event for an already detached menu and to avoid the (bogus)
wxEVT_MENU_CLOSE event as well.

Closes #12668.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 00:36:55 +00:00
Vadim Zeitlin
08e78a5412 Add a test for deleting a sub-menu to the menu sample.
Also fix some typos in the help message.

See #12668.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 00:36:50 +00:00
Vadim Zeitlin
519d7f238c Fix wxUSE_DC_CACHEING spelling in the documentation.
It was consistently misspelt as wxUSE_DC_CACHE.

Closes #12377.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 00:36:45 +00:00
Vadim Zeitlin
9b341e6fa1 No changes, just simplify docview sample a bit.
Remove some unnecessary function arguments and m_frame member variable.

Closes #12374.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 00:36:39 +00:00
Vadim Zeitlin
0c46625036 Correct wxID_SEPARATOR description in menu documentation.
Also correct a typo in Delete() function links.

Closes #12666.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 00:36:30 +00:00
Vadim Zeitlin
382c4adea6 Fix preprocessor definitions for wxBase build under OS X.
Define __WXOSX__ for non-GUI build under Darwin. Ensure that the rest of the
code compiles correctly when just __WXOSX__ is defined but neither of
__WXOSX_{CARBON,COCOA,IPHONE}__ is. This ensures that wxBase can actually be
built under Mac.

Move OS X symbols definitions in wx/platform.h after wx/setup.h inclusion as
they rely on __DARWIN__ and wxUSE_GUI values which are both define in that
file now. Still keep them before wx/chkconf.h inclusion which relies on
__WXOSX_XXX__ being defined. Yes, it's a mess and should be cleaned up more
permanently some day.

Also remove some redundancy from wx/osx/{carbon,cocoa}/private.h by factoring
out common parts into wx/osx/core/private.h. Also include this header itself
from wx/osx/private.h directly instead of including it thrice from different
sub-ports headers.

Closes #12660.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-09 23:53:42 +00:00
Vadim Zeitlin
947d5ad04c Fix timeval struct initialization in wxSelectDispatcher.
The tv_usec field could overflow its maximal value while tv_sec was always
left 0.

It would be even better to reuse SetTimeValFromMS() from socket.cpp here in
the future.

See #11542.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-09 23:53:33 +00:00
Vadim Zeitlin
bbacbe3980 Fix crash in wxCFEventLoop::AddSourceForFD().
Don't reset CFFileDescriptorRef before passing it to
CFFileDescriptorCreateRunLoopSource(), this resulted in a crash inside this
function.

Closes #11542.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-09 23:53:28 +00:00
Vadim Zeitlin
11ea2e3a84 Remove non-existent functions declarations from wxOSX/Carbon.
wxMacSetupConverters() and wxMacCleanupConverters() don't seem to exist any
more so don't declare them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-09 23:53:21 +00:00
Vadim Zeitlin
327ac3ec2a Document wxRenameFile() behaviour when destination is a directory.
Document that the source file is moved to the destination if it's a directory,
apparently this is not obvious.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-08 16:28:57 +00:00
Vadim Zeitlin
d97ee1b955 Unload bogus XRC resources in "garbage" unit test.
Leaving invalid XRC entries in wxXmlResource internal list of loaded resources
resulted in failures in the XRC unit test which executed after this one.

It seems that loading an invalid resource shouldn't prevent the other ones
from loading correctly later and this probably should be corrected at
wxXmlResource level but for now work around this problem in the test itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-08 16:28:51 +00:00
Vadim Zeitlin
adf1edd924 Fix crash in XRC ID range support code.
Really fix removing the record from the linked list. This code was modified by
r66064 but was still wrong because the wrong pointer was updated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-08 13:50:46 +00:00
Vadim Zeitlin
e7cad4b7a1 Compilation fix for STL build after ID range changes in XRC.
Fix compilation of the new code which relied on implicit conversion of
wxString to "const char *" which is unavailable when wxUSE_STL==1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 22:13:55 +00:00
Vadim Zeitlin
d807030e1e Factor our hash function used for XRC ids hash map.
Define the hash function in a separate function instead of duplicating it in
XRCID_Lookup() and RemoveXRCIDEntry().

The hash function is extremely simplistic and inefficient right now, it should
be replaced with wxStringHash::stringHash().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 19:34:05 +00:00
Vadim Zeitlin
74c99b8552 Fix memory leak of XRC ids introduced by the ID range support patch.
Fix bug in linked list processing in RemoveXRCIDEntry() added in r66059: it
incorrectly overwrote the XRC id table entry with the next element in the list
instead of just updating the pointer used during iteration.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 19:33:55 +00:00
Vadim Zeitlin
125c2fccdc Reformat long lines in the new part of the xrc sample.
No changes, just break the too long lines.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 19:33:38 +00:00
Vadim Zeitlin
14f0c8b716 Use Connect() of Bind() in the new part of xrc sample.
Use Connect() for compatibility (notably with VC6 which doesn't support
Bind()). Also connect the event handlers on loading the dialog instead of
waiting until the relevant page is selected, this makes the code slightly
simpler as we don't need to remember whether we connected them or not any
longer.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 19:33:30 +00:00
Vadim Zeitlin
f7aaef4d53 Test both ChangeSelection() and SetSelection() in notebook sample.
Test wxBookCtrl::SetSelection() too to be able to check that it does generate
events as expected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 19:33:22 +00:00
Vadim Zeitlin
409f747ed9 Don't require skipping "page changed" event in wxMSW wxNotebook.
wxMSW wxNotebook implementation used to handle EVT_NOTEBOOK_PAGE_CHANGED event
to update the currently shown page which meant that page changing was broken
if the user code handled and didn't skip this event.

As the other ports don't require the user code to skip this event, don't do
this in wxMSW neither and always update the selected page unconditionally.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 19:33:10 +00:00
Vadim Zeitlin
0526c8cc07 Add support for id ranges to XRC.
Allow to declare ranges of consecutive IDs in XRC by using the "id[n]" syntax.
Show this functionality in the xrc sample and test it in the new unit test.

Also show and test the "object reference" XRC functionality.

Closes #11431.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 14:00:59 +00:00
Vadim Zeitlin
1f6ea93556 Make wxXmlResource::ReportError() wxXmlNode parameter const.
This function (and the related DoReportError()) doesn't need to modify its
"context" argument so take a const-pointer in it.

See #11431.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 14:00:43 +00:00
Vadim Zeitlin
62d3301bf9 Mention the GUI test in the unit test tech note.
Update the tech note to mention the (relatively) new GUI test program too.

See #11431.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 14:00:31 +00:00
Vadim Zeitlin
5fcef18409 Update and reorganize XRC overview to make it more useful.
Emphasize the parts most useful for the new users instead of more advanced
concepts and generally make the text more readable.

Closes #12661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 14:00:19 +00:00
Peter Cawley
955bad410e Add support for toggle buttons to wxRibbonButtonBar.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 13:44:22 +00:00
Vadim Zeitlin
258593354e Fix build with Borland C++ compiler.
Disable some parts of the code that this compiler had problems with. Add
parentheses to work around its bugs elsewhere.

Closes #12558.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 13:16:20 +00:00
Vadim Zeitlin
0ce0f1e9eb Update all windows associated with the tooltip when it changes in wxMSW.
Although the tooltip was initially correctly set for all windows associated
with it, it was only updated for the main one if its text changed later. This
resulted in leaving the old tooltip for the composite controls such as
wxComboBox or controls with sub-windows such as wxRadioBox.

Fix this by storing all windows associated with the tooltip (for space
efficiency, only allocate the array if necessary however as it will be empty
in the majority of cases) and apply SetTip() to all of them, not just the main
one.

Closes #12659.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 13:12:16 +00:00
Stefan Csomor
2d64bab703 disable code because of OS bug, fixes #12478, fixes #12554
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-07 11:54:09 +00:00
Peter Cawley
32eb560338 Improve behaviour of scrolling through a ribbon gallery.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-06 23:46:25 +00:00
Stefan Csomor
76b1a2c26e routing the tab, return events for single line fields back to standard wx handler (doesn't work for secure fields unfortunately), fixes #12386 and partly #12392
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-06 15:48:48 +00:00
Stefan Csomor
3f30bd1a8d implementing turning off of default button as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-06 15:37:12 +00:00
Vadim Zeitlin
b895954d3f Minor cosmetic fix to generic check tools appearance in wxOSX.
Use rounded rectangle to indicate the selected tool instead of a plain one.

Closes #12409.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:43:33 +00:00
Vadim Zeitlin
5e9897b4be Fix check toolbar items behaviour in non-native toolbars in wxOSX.
Update the button state when the tool is toggled. Also use NSToggleButton for
this tool and not NSOnOffButton as the latter doesn't use the alternative
(toggled) image.

Closes #12408.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:43:28 +00:00
Vadim Zeitlin
c71096a055 Avoid using wx GDI classes from non-main thread in wxOSX/Cocoa.
OS X uses a background thread for pulsing the default button and we intercept
the draw requests from it. As our drawing code is not MT-safe, executing it
from the non-main thread can result in crashes.

Avoid this by simply not doing anything fancy when called from a background
thread and simply deferring to the superclass instead.

Closes #12407.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:43:18 +00:00
Vadim Zeitlin
ed310c35b4 Really update tooltip when wxToolBar::SetShortHelp() is called.
Changing a toolbar tool tooltip didn't work in wxOSX/Cocoa because the new
value was never propagated to the native control.

See #12362.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:43:13 +00:00
Vadim Zeitlin
0b79709d3c Remove trailing comma from an enum.
Comma after last enum element is not allowed in C++98 and some compilers will
warn about it.

Closes #12591.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:43:07 +00:00
Vadim Zeitlin
f58438058b Show the first, not the last, inserted item in wxListBox in wxOSX.
The listbox showed its last, not first, item after creation in wxOSX which was
inconsistent with the other ports and generally inconvenient.

Fix this by ensuring that the first item being inserted is shown, and not the
last one as was (implicitly) the case before. A better fix would be to avoid
scrolling entirely but I don't know how to do this with NSClipView.

Closes #12365.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:42:49 +00:00
Vadim Zeitlin
b2b6121609 Use CGFloat instead of float for mouse wheel event parameters.
This fixes mouse wheel handling in 64 bits where CGFloat has size different
from float.

Closes #12168.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:42:28 +00:00
Vadim Zeitlin
247bb51058 Fix showing the frames full screen under OS X.
Don't leave space for the title bar when showing the frame full screen.

Closes #11701.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:41:56 +00:00
Vadim Zeitlin
0d65f8d20f Improve default position for new TLWs in wxOSX.
Put the new windows in the upper left corner of the screen but not at (0, 0)
as before, this was rather inconvenient and too different from the normal
application behaviour under OS X.

Closes #11926.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:40:30 +00:00
Vadim Zeitlin
8244507f68 Ensure that strings returned by wxMBConv_cf are in NFC form.
Normalize all Unicode strings used internally even though the Darwin kernel
gives them to us in decomposed (NFD) form.

Closes #11730.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:40:09 +00:00
Vadim Zeitlin
dc36b43adf Remove duplicate wxEVT_COMMAND_TEXT_ENTER generation from wxOSX/Cocoa.
The code in -[wxNSTextField control:textView:doCommandBySelector:] generated a
second copy of this event as it was also generated from
wxNSTextFieldControl::controlAction() for single line text controls.

Closes #11691.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:39:49 +00:00
Vadim Zeitlin
209a9f5822 Don't update scrollbars when the window is being destroyed in wxOSX.
Updating scrollbars for a window that is being destroyed anyhow is useless and
resulted in crashes in the htlbox sample because it used client-to-screen
coordinates conversion which asserted because the TLW was invalid any more and
this unexpected assert during window destruction led to a crash.

Simply don't do it at all to avoid the problem.

Closes #11776.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:39:29 +00:00
Vadim Zeitlin
df7d93f67b Fix crash in wxColour ctor from NSColor in wxOSX/Cocoa.
wxColour ctor from NSColor added by Kevin Ollivier in r62525 never worked as
it passed NULL pointer to NSColor:getComponents and so always crashed. This
resulted in a crash in the rich text editor of the text sample, for example.

Fix this by passing a valid array containing colour components instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:39:09 +00:00
Vadim Zeitlin
3721dc6efe Remove unnecessary wxOSX_USE_COCOA guards in Cocoa-only file.
The #if wxOSX_USE_COCOA seems unnecessary in a file that is used in
wxOSX/Cocoa only so simply remove it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:38:49 +00:00
Vadim Zeitlin
b7db378853 Assume sizeof(wchar_t) is always 4 under OS X.
wchar_t used to be 2 bytes in Mach-O builds but they're not supported any
longer so remove the code checking for sizeof(wchar_t) and just assume it's
always 4.

Closes #10442.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:38:25 +00:00
Vadim Zeitlin
f40377bedc Add another test for the insertion point position after SetValue().
Verify that setting the value of a previously not empty control resets
the insertion point to its beginning.

See #10051.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:37:54 +00:00
Vadim Zeitlin
4a695c4689 Disable keyboard unit test with wxUIActionSimulator under OS X.
The test doesn't work because the test window never get any events. This might
be a bug in the test or in wxUIActionSimulator itself but for now I just have
no idea about how to fix it, so disable the test to let the rest of the test
suite run.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 21:37:27 +00:00
Chris Elliott
2dea359953 add execmon to CE exclude (no console)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 16:05:38 +00:00
Chris Elliott
b45054eaaf missing namespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 15:45:51 +00:00
Chris Elliott
bbaf9672e6 missing namespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 15:24:27 +00:00
Vadim Zeitlin
4ded4e1910 Remove test code accidentally committed as part of r66015.
Don't call wxMenuItem::Set{Background,Text}Colour() in the menu sample, this
was for testing only.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 12:53:44 +00:00
Jouk Jansen
0ea0feb82f Update OpenVMS makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 06:55:31 +00:00
Vadim Zeitlin
85898d8b4d Correct a trivial typo in wxLog documentation.
Just remove an extra word.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-04 16:13:27 +00:00
Vadim Zeitlin
e801524514 Use explicit menu item background if it's given under MSW.
An explicit item background colour specified in user code should override the
default theme background.

Closes #12652.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-04 10:57:19 +00:00
Vadim Zeitlin
b146648622 No changes, just use RAII-based classes in MSW owner drawn menu code.
Add helper HDC{TextCol,BgCol,BgMode}Changer classes which ensure that the
corresponding HDC attribute is reset on scope exit instead of manually calling
the corresponding MSW functions to set and reset it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-04 10:57:13 +00:00
Vadim Zeitlin
2a9a4f5be9 Pas long to _get_timezone() even for VC8.
Apparently the MSDN documentation for VC8 is wrong and _get_timezone()
function expects a long and not int when using it (as is already the case with
VC9 and VC10).

Closes #12653.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-04 10:49:10 +00:00
Jouk Jansen
b87b399c48 Updating makefiles for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-04 07:38:13 +00:00
Vadim Zeitlin
9939bfd98b Remove unused mouse event handler from dataview sample.
The mouse event handler for the frame was never executed because the frame is
entirely covered by other windows in this sample. Not sure what was meant here
but this handler is useless so just remove it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 23:48:30 +00:00
Vadim Zeitlin
d632aa8157 Remove unnecessary tests for m_log from dataview sample.
The sample contained a lot of unnecessary checks for m_log, remove them to
make the code shorter and simpler to understand.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 23:48:23 +00:00
Vadim Zeitlin
ab84bafe49 Add wxAuiPaneInfo::IsDockable().
This function checks if the pane can be docked at any side. It is useful in
its own right but most importantly is needed to fix compilation broken in
r66005 which used it before it was added.

See #12648.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 16:36:34 +00:00
Vadim Zeitlin
ca81b52e62 Set column field of wxDVC ITEM_{ACTIVATED,CONTEXT_MENU} events.
Add missing calls to wxDataViewEvent::SetColumn() and SetDataViewColumn().

In the future it would be nice to refactor the code to have a common event
object initialization function that would make it impossible to forget to do
this.

Closes #12649.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 16:29:36 +00:00
Vadim Zeitlin
30b0888647 Don't dock undockable panes in wxAuiManager::LoadPerspective().
All panes were docked when loading a perspective, including those that were
created to be non-dockable. Don't dock the latter ones now.

Closes #12648.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 16:29:30 +00:00
Vadim Zeitlin
10875c13e9 Optimize wxDataViewMainWindow::FindNode() in generic wxDataViewCtrl.
Avoid unnecessary heap allocations and extra indirections and just use the
items pointers directly.

Also avoid copying the (potentially huge) nodes arrays.

Closes #12647.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 16:29:23 +00:00
Vadim Zeitlin
5ca9771ff3 Don't copy potentially big arrays in generic wxDataViewCtrl.
Use reference to hold the array of nodes instead of copying it.

(Really) closes #12587.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 16:29:18 +00:00
Vadim Zeitlin
53250e3afa Handle wxLOCALE_DECIMAL_POINT in wxLOCALE_CAT_MONEY correctly in wxMSW.
Use LOCALE_SMONDECIMALSEP and not LOCALE_SDECIMAL when querying for the
decimal separator in money category, it can be different from the usual
numeric one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 16:29:13 +00:00
Vadim Zeitlin
f4f3c8f3bb Support wxLOCALE_THOUSANDS_SEP in wxMSW wxLocale::GetInfo().
Simply use ::GetLocaleInfo(LOCALE_STHOUSAND) for it.

Closes #12643.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 16:29:06 +00:00
Jouk Jansen
a987bdfa22 replace m_nSelection by m_selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 14:44:57 +00:00
Jouk Jansen
0de66257d9 Update OpenVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-03 08:54:52 +00:00
Václav Slavík
530646ca27 Fix compilation error in wxImplicitConversionType<> in gcc strict mode.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-02 22:55:56 +00:00
Vadim Zeitlin
7e9c57542f Use _get_timezone() function instead of _timezone with MSVC8+.
While some (but not all) versions of VC8 CRT still define _timezone variable,
it is deprecated and shouldn't be used and referencing it can result in
linking problems if it pulls in static CRT.

Just use _get_timezone() function instead for the VC versions that support it
(as was already done in r54417 for VC8 in 2.8 branch).

Closes #4691.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-02 11:57:30 +00:00
Vadim Zeitlin
3fee3116dd Make write end of the child process pipe non-blocking under Unix.
We need to make at least one end of the pipe used to communicate with
wxExecute() child process non-blocking to avoid deadlocks, so unblock the
write end of the pipe. It seems to be unnecessary to unblock the reading ends
of std{out,err} pipes as we can already check for the presence of input there.
This is also consistent with wxMSW behaviour.

Closes #12636.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-02 11:57:24 +00:00
Vadim Zeitlin
b835320170 Refactor: extract code to make an fd non-clocking into a function.
Simply extract part of the code from evtloopunix.cpp into a reusable
wxPipe::MakeNonBlocking() function to be able to reuse it elsewhere.

See #12636.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-02 11:57:19 +00:00
Vadim Zeitlin
4445d0357b Don't scroll the grid too much to bring selection in view.
wxGrid scrolled completely to the right in row selection mode as it was always
trying to make the bottom right selection corner visible. This was due to
adjusting the selection block corner to cover the entire row in this mode (of
course, the same was true for the column selection mode too).

Don't do this any more as it's unnecessary, making the real selection block
corner visible is enough for the block selection mode and nothing else is
needed in row/column modes.

See #12638.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-02 11:57:14 +00:00
Vadim Zeitlin
878f28d8c8 Changed wxImage::ConvertAlphaToMask() return type to bool.
Make this function more useful by returning true from it if alpha channel was
really converted to the mask by it.

Closes #12637.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-02 11:57:09 +00:00
Vadim Zeitlin
6f26925422 Avoid crash when releasing the mouse in wxRibbonToolBar.
The active tool pointer can be changed/set to NULL by the event handler in
wxRibbonToolBar::OnMouseUp() so test for it before using it after processing
the event.

Closes #12640.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-02 11:57:03 +00:00
Robin Dunn
d22e07bf6c Add some asserts to ensure cols and rows are >= 0 to avoid crashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-02 03:09:27 +00:00
Robin Dunn
6cb2477d9f Fix return types on wxRect::Inflate and Deflate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-02 03:07:35 +00:00
Jouk Jansen
04b11eb3fb Create work-around for wxGetEnvMap on OpenVMS (correction)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-01 11:58:31 +00:00
Jouk Jansen
cc22153550 Create work-around for wxGetEnvMap on OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-01 09:48:56 +00:00
Vadim Zeitlin
b64f93b67f Make wxMBConv_iconv MT-safe by not using wxString in it.
Use just "char *" for wxMBConv_iconv::m_name to avoid MT-safety problems
related to using a wxString (which is not always MT-safe) from multiple
threads.

See #12630.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-31 13:41:03 +00:00
Vadim Zeitlin
60d5c563d2 Avoid events when implicitly selecting first wxBookCtrl page.
The first page added to a wxBookCtrlBase-derived control is always selected,
even if "bSelect" argument of AddPage() was false. This is necessary because
a non-empty book control must always have a selection but the "selection
changed" event generated when doing it is unexpected.

Fix this by not generating any events when the first page is implicitly
selected.

Closes #12075.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-31 13:33:34 +00:00
Vadim Zeitlin
03263ff73b Reposition wxSpinCtrl correctly after reparenting it in wxMSW.
The position of wxSpinCtrl after reparenting was wrong because we didn't
remember the old position early enough.

There also was a more minor bug which resulted in the position not being set
correctly if (any of its components) was -1 before reparenting.

Closes #12633.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-31 11:37:31 +00:00
Vadim Zeitlin
bc73fe96a2 Destroy correct HWND in wxMSW wxSpinCtrl::Reparent().
NULL HWND was passed to ::DestroyWindow() as wxWindow::UnsubclassWin() NULLed
it after unsubclassing.

See #12633.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-31 11:37:26 +00:00
Vadim Zeitlin
053e42428d Document wxMessageQueueError.
Document the enum defining the error codes of wxMessageQueue<> class.

Closes #12634.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:51:18 +00:00
Vadim Zeitlin
2d4dcfe1a5 wxUniv/MSW compilation fix in wxWindowBase::GetDlgUnitBase().
This wxWindowBase method can't access protected m_font member of another
wxWindow object -- but can access it in wxWindowBase object.

Closes #12358.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:51:14 +00:00
Vadim Zeitlin
f7196178a5 No changes, just use AutoHBITMAP instead of manual DeleteObject() in wxMSW.
Use RAII AutoHBITMAP class instead of manually calling DeleteObject() on
temporary bitmaps in wxMSW wxImageList and wxBitmap code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:51:09 +00:00
Vadim Zeitlin
2e7a64e9e6 Fix conversion of bitmaps with alpha to icons/cursors in wxMSW.
CreateIconIndirect() applies pre-multiplication to the bitmap itself (as can be
seen by experimenting with this or reading WINE sources for it) and so we must
pass it a bitmap with data in non-pre-multiplied format to avoid doing it
twice.

This is similar to the change to wxImageList in the previous commit, see #9050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:51:04 +00:00
Vadim Zeitlin
5c96c8649e Add bitmaps in non-premultiplied format to wxImageList in wxMSW.
ImageList_Draw() applies pre-multiplication to the bitmap itself (as can be
seen by experimenting with this or reading WINE sources for it) and so the
image list must store bitmaps with data in non-pre-multiplied format to avoid
doing it twice.

Do it by converting wxBitmaps passed to wxImageList::Add() and Replace() to
wxImage and then to non-pre-multiplied DIBs. This is obviously very
inefficient but at least results in correct appearance of images drawn by
wxImageList so it's a step forward.

Closes #9050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:50:55 +00:00
Vadim Zeitlin
fd90675b89 Allow creating DIBs storing pixels in non-premultiplied format in wxMSW.
wxDIB assumed that MSW always uses bitmaps in pre-multiplied pixel format but
this turns out to be wrong: some Windows functions such as ImageList_Draw()
or CreateIconIndirect() apply pre-multiplication internally and so must be
given data in non-pre-multiplied format on input.

This commit adds a possibility to create wxDIB in such format but doesn't use
it anywhere yet, this will be done in subsequent commits.

See #9050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:50:50 +00:00
Vadim Zeitlin
a72ebcd091 Make it impossible to initialize AutoHBITMAP after construction.
Add default ctor and Init() method to wxMSW private AutoHBITMAP class.

This doesn't change anything for now but will be used by an upcoming commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:50:45 +00:00
Vadim Zeitlin
7ee21e3a3d Fix fatal bug in wxGetWindowFromHWND() for radio buttons.
wxGetWindowFromHWND() could crash if it was called for a HWND of a radio
button which was not created by wxWidgets because it blindly dereferenced the
user data associated with the button expecting it to be a pointer to
wxRadioBox and crashed if it was something different. And this actually
happened when using the standard Windows printing dialog which can contain
radio buttons which obviously used their user data field for their own
purposes.

Fix this by maintaining a global hash map with radio buttons HWNDs as keys and
radio boxes as values. This ensures that we can always safely check whether
the given HWND is a radio button in one of our radio boxes or not.

Also change wxSpinCtrl which already did something similar in a different way
(using an array instead or a more efficient hash map) for consistency.

Closes #12083.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:50:39 +00:00
Vadim Zeitlin
a16e51b56a Restore the old logger in wxLogChain dtor instead of deleting it.
wxLogChain was leaving the global log target pointing to a deleted object,
resulting in crashes when using wxLogWindow without any explicit
SetActiveTarget() calls.

Restore the original logger as the active target in wxLogChain dtor to ensure
that the active log target remains valid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:50:28 +00:00
Vadim Zeitlin
3120eccfe2 Fix confusion with LOGFONT{A,W} parameters to MSW GetTheme[Sys]Font().
Change the signature of GetThemeFont() and GetThemeSysFont() methods of
wxUxThemeEngine to take an artificial wxUxThemeFont::Ptr type instead of
LOGFONT which allows the broken code to compile correctly and even work in
Unicode builds but crashed in ANSI ones under Windows Vista/7 as these
functions expect a LOGFONTW and not LOGFONTA even in non-Unicode build under
these systems.

This generalizes the previous fix/workaround for the same problem in
wxStaticBox so remove it now and use wxUxThemeFont both there and in
wxMenuItem to avoid crashes when using owner-drawn menus in ANSI build.

Closes #12364.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:50:22 +00:00
Vadim Zeitlin
abaa31e7ea No real changes, just cleanup of wxMSW MenuDrawData.
Derive MenuDrawData::Margins from Windows MARGINS struct to avoid ugly (and
potentially dangerous) reinterpret_cast<>s when using it.

Also add some helper functions to Margins to make using it less painful.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 23:50:08 +00:00
Vadim Zeitlin
7eae80a04b Use TAbs in debian/rules, not spaces, as it's a makefile.
Fix make syntax error in debian/rules.

Closes #12631.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 19:01:15 +00:00
Vadim Zeitlin
c9c4274adc Fix order of arguments in wxOSX/Carbon wxListCtrl::ScrollList().
wxMacDataBrowserTableViewControl::SetScrollPosition() takes "top" and "left"
arguments so swap "dx" and "dy" parameters being passed to it.

It might be better to fix SetScrollPosition() to follow the more natural (at
least from wx point of view) convention and as it's used in only a few places
this wouldn't be difficult to do. But let's keep the changes to this code to
the minimum for now.

Closes #12339.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 19:01:10 +00:00
Václav Slavík
0645bd388c For large dataview controls, don't use all items to calculate best column width.
Instead, use just top and bottom N/2 items for some large enough value
of N. N is determined dynamically so that column best width calculation
doesn't take more than 50ms.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 15:57:59 +00:00
Václav Slavík
f0ccd2cbfa Add wxDataViewRendererBase::PrepareForItem() helper.
For calling SetValue() and SetAttr() consistently, instead of having the
same code duplicated all over the place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 15:57:55 +00:00
Václav Slavík
86755098f5 Account for text attrs in generic wxDataViewCtrl's renderers.
When determining cell content's size, GetSize() measured the text using
wxDataViewCtrl's font, even though it could be renderer in bold or
italics.

Corrected by setting the attributes - and not only the value - prior to
GetSize() calls, and by using the right font in GetTextExtent() calls.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 15:57:49 +00:00
Václav Slavík
d0154e3a5a Add optional columns autosizing to wxDataViewCtrl.
Only implemented in the generic and GTK+ versions at the moment, OS X
support will be added later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 15:57:41 +00:00
Václav Slavík
9aebcb5e44 Add wxRenderer::GetHeaderButtonMargin().
Used for best size calculations of column width.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-30 15:57:32 +00:00
Paul Cornett
34d2ab14c1 fix iconize event detection, logical operators don't work for testing bits
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-28 16:41:29 +00:00
Vadim Zeitlin
d176b30156 Use floating point arithmetic in wxDC::GradientFillConcentric().
Use doubles to avoid accumulated rounding errors from using integers in the
generic implementation of wxDC::GradientFillConcentric(). This results in
smoother gradient.

Also avoid using the expensive pow() function inside the inner loop when we
just need to calculate a square.

Closes #12337.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-28 14:23:18 +00:00
Vadim Zeitlin
7825e32171 Fix generic implementation of wxDC::GradientFillConcentric().
The selected colour was not used as the code simply changed the value of
m_pen but didn't call SetPen() to actually use it. This resulted in always
using the default (black) colour when drawing concentric gradients.

Fix this by calling SetPen().

See #12337.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-28 14:23:14 +00:00
Vadim Zeitlin
3a61f5db2c Relax validation of wxCheckBox flags.
Changes of r65824 resulted in asserts when creating wxCheckBox with just
wxBORDER_NONE style. This is useless but used to be harmless so continue to
allow this.

Closes #12628.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-28 14:23:09 +00:00
Vadim Zeitlin
ce0ee9aec1 Improve positioning of wxSlider min/max labels in wxMSW.
Put the min/max labels on the sides or a horizontal slider or above/below a
vertical one to make them visually more distinct from the current value label.

See #11427.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-28 13:52:50 +00:00
Vadim Zeitlin
4ea1bb9d09 wxOSX/Carbon compilation fix after wxListBoxBase changes.
Making wxListBoxBase::CalcAndSendEvent() broke wxOSX/Carbon build, fix it by
making the class which needs to call it friend of wxListBox in this port.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-28 10:27:32 +00:00
Vadim Zeitlin
486fa39656 Don't crash when waiting for thread termination in wxMSW.
The changes of r65882 adding wxThread::On{Delete,Kill}() introduced a bug
which made normal wxThread::Wait() crash.

Fix it by calling OnDelete() only if we're really deleting a thread.

Closed #12627, see #9046.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-28 10:27:26 +00:00
Vadim Zeitlin
24d7c81c32 Fix list box unit test under wxGTK.
Select an item initially to prevent GTK from doing it automatically as soon as
the listbox is clicked anywhere (even outside of the items area).

This makes all GUI tests finally pass under wxGTK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 23:22:11 +00:00
Vadim Zeitlin
00d45d0452 No changes, just use wxGtkObject<> instead of g_object_unref().
Use smart pointer class instead of manually writing g_object_unref(). This
makes code shorter and less error-prone.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 23:22:05 +00:00
Vadim Zeitlin
09e744f552 Don't duplicate event sending code in wxGTK wxListBox.
Reuse wxListBoxBase::SetEvent() instead of duplicating its code in wxGTK.

Also get rid of the code checking for selection of the item with index -1:
this can't happen any more since r65865 which changed GTK_SELECTION_SINGLE to
GTK_SELECTION_BROWSE.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 23:22:00 +00:00
Vadim Zeitlin
24ee1bef74 Don't send SELECTED events for an already selected item in wxGTK wxListBox.
Bring wxGTK in line with wxMSW behaviour and avoid sending the
wxEVT_COMMAND_LISTBOX_SELECTED events when the user clicks on an already
selected item.

Refactor wxMSW code to extract the logic to avoid such events into a reusable
in other ports wxListBoxBase::DoChangeSingleSelection() function. Also add
wxListBox::GTKOnSelectionChanged() to wxGTK to avoid having to make the new
function public just so that it could be called by GTK callback and make the
previously existing CalcAndSendEvent() protected as well.

This fixes a unit test failure in ListBoxTestCase::ClickEvents() under wxGTK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 23:21:55 +00:00
Vadim Zeitlin
af0b20630c wxOSX compilation fix: remove just added extra semicolon.
r65931 forgot to remove a now extra semicolon from wx/osx/notebook.h, fix it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 21:41:55 +00:00
Vadim Zeitlin
2a0ca9dbaf Fix warnings about signed/unsigned comparisons inside wxMax() and friends.
wxMax, wxMin and wxClip work correctly when called with a mix of signed and
unsigned arguments but give warnings about comparing them when compiled with
g++.

Cast both arguments to the result type, which is defined consistently with
standard C rules for implicit promotion, before comparing them to avoid this.

Also add more tests to check that using these functions in this case doesn't
provoke warnings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 20:23:55 +00:00
Robert Roebling
f0f0542da6 Use window-state-event to send ICONIZE events under GTK+, probably fixes #10973: Iconize event triggered when switching workspaces with Ctrl+Alt+[Arrow Key]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 19:42:38 +00:00
Vadim Zeitlin
681be2ef80 Refactor: use wxBookCtrlBase::m_selection in all derived classes.
All book control classes with the exception of wxGTK wxNotebook stored the
currently selected page in m_selection or m_nSelection (or, in wxUniv
wxNotebook case, m_sel) variable. Remove all of them and add m_selection
directly to the base class itself so that it can be reused everywhere.

Closes #12622.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 16:54:36 +00:00
Vadim Zeitlin
7e837615b9 No real changes, just replace -1 with wxNOT_FOUND in wxBookCtrl code.
Make the code consistently use wxNOT_FOUND instead of -1 everywhere.

See #12622.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 16:54:24 +00:00
Vadim Zeitlin
ef0fdf3914 Don't dispatch messages while waiting in worker thread in wxMSW.
We only want to continue dispatching messages while waiting for another thread
to terminate if we are waiting in the main thread.

Closes #12618.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-26 15:11:06 +00:00
Vadim Zeitlin
bd63e363c2 Compilation fix for wxUSE_UNICODE_WCHAR && !wxUSE_STL_BASED_WXSTRING.
Construct wxScopedWCharBuffer using CreateNonOwned() in
wxString::ToStdWstring() in this case, creating it directly from wc_str()
doesn't work (intentionally, as this doesn't tell if the buffer owns the
string or not).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-26 15:11:00 +00:00
Vadim Zeitlin
d72177fd4d Better document wxAutomationObject::GetDispatchPtr() return value.
This function returns IDispatch pointer as a void one, mention that the user
code needs to upcast it itself.

Closes #12617.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-26 15:10:54 +00:00
Vadim Zeitlin
7ec75d3e9f Rebake to add wx/meta/implicitconversion.h to the makefiles.
Rebake after the addition of a new public header in r65920.

Closes #12616.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-26 15:10:48 +00:00
Vadim Zeitlin
cc721f7dd2 Mention that resource forks are deprecated under Mac in wxCursor docs.
See #12614.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-25 21:52:19 +00:00
Vadim Zeitlin
86646f2aef Use the correct accelerator for the "Preferences" Apple menu item.
Use the standard Command-, accelerator for the standard "Preferences" item in
the Apple menu.

Closes #12121.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-25 20:46:18 +00:00
Vadim Zeitlin
c8bef6e379 Use the application name in the "About" item of the Apple menu.
To conform to Apple UI guidelines the application name should be included in
the "About" menu item label in the Apple menu.

See #12121.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-25 20:46:11 +00:00
Václav Slavík
fd7c5da65e Add wxImplicitConversionType tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-25 09:43:04 +00:00
Václav Slavík
a52475807e Make wxMin, wxMax and wxClip template functions.
Previously used macro's arguments were evaluated twice, but there were
many occurences of their use in our code that didn't account for this
and used expensive-to-evaluate arguments as if they were functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-25 09:43:00 +00:00
Vadim Zeitlin
1f4c7e791b Compilation fix: don't use "environ" under OS X.
The global environ variable is not directly accessible under OS X, use
_NSGetEnviron() instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-25 09:22:19 +00:00
Vadim Zeitlin
b2e04188bd Make wxUString compilable with VC6.
Provide replacements for std::basic_string functionality missing from this
compiler standard library.

Closes #12357.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 23:06:11 +00:00
Vadim Zeitlin
f73785b104 Fix typo in wxFILTER_NUMERIC documentation.
Replace wxFILTER_SIMPLE_NUMBER with wxFILTER_DIGITS.

Closes #12341.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 23:03:43 +00:00
Vadim Zeitlin
a70d268a1b Add wxDocManager::FindTemplate() method.
This allows to find the template corresponding to the document of the given
class.

Closes #12170.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 23:03:38 +00:00
Vadim Zeitlin
35f82b01cf Don't handle RPC_E_CHANGED_MODE return of OleInitialize() as an error.
This error means that OLE had already been initialized so from our point of
view it counts as a success.

Closes #12516.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 23:03:31 +00:00
Vadim Zeitlin
71f5b0e7da Do nothing in wxMemoryDC::SelectObject() if the bitmap is already selected.
It doesn't make sense to make a copy of the bitmap in order to select it into
wxMemoryDC if it's already selected into it.

See #11640.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:41:46 +00:00
Vadim Zeitlin
648c1af93d Always create new OLE objects with reference count of 1, not 0.
There are no real changes but ensure that the new objects of classes using
DECLARE_OLE_UNKNOWN() macro are created with valid reference count of 1
instead of being created in phantom state with reference count of 0.

Remove the now unnecessary AddRef() and add the now required DecRef() calls.

See #11566.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:41:41 +00:00
Vadim Zeitlin
e0b5dc3d63 Fix problems with reference counting in wxActiveXContainer.
Ensure that the IFrameSite object is created with valid (i.e. non-zero)
reference count by calling AddRef() on it immediately after creation and
remove the weird QueryInterface() call which was used to work around this bug.

Closes #11566.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:41:36 +00:00
Vadim Zeitlin
21e5aa164e Don't consider lack of connection points an error in wxActiveXContainer.
Handle CONNECT_E_NOCONNECTION return value from IConnectionPointContainer::
FindConnectionPoint() as an expected error and don't complain about it.

See #11566.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:41:29 +00:00
Vadim Zeitlin
58331be29a Don't activate the window when updating its styles in wxMSW.
Add SWP_NOACTIVATE to the flags used by wxWindow::MSWUpdateStyle(). This
allows to change the style of a window without necessarily activating it.

Closes #11560.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:41:24 +00:00
Vadim Zeitlin
6969b18cc7 Fix wrong wxLogDebug() call in fswatcher sample.
Replace wxLogDebug() with wxLogTrace() as was probably intended. This fixes
the assert which happened when running the sample because of the wrong number
of parameters passed to wxLogDebug().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:41:18 +00:00
Vadim Zeitlin
5fc3e6d448 Allow specifying the directory to watch on command line of fswatcher sample.
This makes it more convenient to run the sample repeatedly as the directory to
watch can be specified only once instead of having to choose it interactively
after the sample startup every time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:41:13 +00:00
Vadim Zeitlin
942f40ca24 Avoid duplicate wxEVT_COMMAND_TREE_SEL_CHANG{ING,ED} events in wxMSW.
When changing the selected item programmatically 2 CHANGING and CHANGED events
were sent because the assumption that comctl32.dll didn't send these events
itself was not correct any more, it does send them at least since XP. However
to avoid the tests for its exact version it's simpler to just ignore the
events it generates and continue sending our own ones.

Closes #11274.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:41:08 +00:00
Vadim Zeitlin
1da2783c33 Don't grab focus when calling wxTreeCtrl::SelectItem().
The workaround for the unexpected events order introduced in r49588 should
only apply to the situation when the user selects an item in the tree, not
when it's done programmatically as this results in unexpected focus changes
(see #11274).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:41:03 +00:00
Vadim Zeitlin
e4545e0183 Allow to use space to toggle spinning of the cube in OpenGL sample.
Small enhancement to the cube OpenGL sample.

Closes #11545.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:58 +00:00
Vadim Zeitlin
22993989b4 Don't send wxEVT_COMMAND_TREE_ITEM_MENU event without valid item in wxMSW.
The generic wxTreeCtrl version only sends this event when the mouse is right
clicked on a valid item so do the same in wxMSW version too for consistency.

This is also consistent with wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK event and
avoids strange problems with unexpected wxEVT_COMMAND_TREE_ITEM_MENU events
generated on right double click.

Finally, replace the checks for item validity in the event handler in the
sample with asserts which should loudly complain if it happens to be invalid.

Closes #11226.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:52 +00:00
Vadim Zeitlin
0bb84570ce No real changes, just cleanup week days handling in wxGenericCalendarCtrl.
Use helper GetWeek{Start,End}() functions instead of repeating tests for
wxCAL_MONDAY_FIRST over and over again.

Also replace some occurrences of GetWindowStyle() with shorter and more clear
HasFlag().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:47 +00:00
Vadim Zeitlin
3c9863aca7 Keep displayed month and year in sync in wxGenericCalendarCtrl.
When the date was constrained to a range in wxGenericCalendarCtrl, the display
of the month in the month combobox could get out of sync with its real value.

Ensure that the correct month is always displayed and also simplify the code
by removing the apparently unnecessarily complex logic in ChangeYear() and
ChangeMonth() functions.

Closes #11060.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:41 +00:00
Vadim Zeitlin
69060f4f0c No real changes, just inline wxDIB::Create().
After removing wxDIB::m_hasAlpha in the previous commit, this method became
completely trivial so put it inline in the header.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:34 +00:00
Vadim Zeitlin
20af6fd5d3 Remove wxDIB::m_hasAlpha from wxMSW.
This field can't be set reliably as we don't know if LoadImage() Windows
function loaded an 0RGB or an RGB bitmap so remove it completely to avoid the
risk of using it wrongly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:27 +00:00
Vadim Zeitlin
254f9b4c3c Fix conversion of 32 bit ARGB bitmaps to wxImage in wxMSW.
wxDIB::m_hasAlpha can't be trusted when the DIB was loaded from a file so
don't rely on it in wxDIB::ConvertToImage(). Instead, suppose that 32 bpp
bitmaps do have alpha channel and only get rid of it at the end of conversion
if it turns out that all alpha values were 0.

Closes #10133.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:22 +00:00
Vadim Zeitlin
c8ecb454c6 Don't hard code "open" verb in wxMSW wxLaunchDefaultApplication().
Don't choose the verb explicitly and let ShellExecuteEx() choose the default
one. In the vast majority of cases this will do the same thing but if some
file type doesn't have an "open" verb the new version will still open it
correctly using its default verb while the old version failed.

See #10707.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:17 +00:00
Vadim Zeitlin
164db92c14 Add support for specifying child process cwd and env to wxExecute().
Add an optional wxExecuteEnv parameter to wxExecute() which allows to specify
the initial working directory and custom environment for the child process.

Closes #12163.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:11 +00:00
Vadim Zeitlin
fab8784c71 Treat wxToolbook symmetrically with others in the notebook sample.
Use wxToolbook as the default notebook type if the other ones are not
available.

Closes #12610.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:01 +00:00
Vadim Zeitlin
448ca22809 Don't reserve space for hidden controller in wxBookCtrl.
Even when the controller was hidden, space was still allocated for it by
wxBookCtrl. Fix this by only reserving extra space when the controller is
shown.

Closes #12609.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:39:55 +00:00
Vadim Zeitlin
5995a84fcf Set wxKeyEvent::m_rawFlags to hardware key code in wxGTK.
The raw flags were previously unused in wxGTK but hardware key code is an
important information which may be useful to the application, so pass it in
the flags (this is rather symmetric with passing lParam in it under MSW as
lParam contains the scan code, among other things).

Also document the meaning of raw key code and flags in all the major ports.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 14:34:45 +00:00
Vadim Zeitlin
21567b0960 Output header to the same directory as the .cpp file in wxrc.
If "-o" option is given, generate the output header file in the same directory
as the .cpp file and not in the current directory.

Closes #4054.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 14:34:22 +00:00
Vadim Zeitlin
7c4e16e698 Use wxChoicebook instead of wxNotebook in the xrc sample.
wxNotebook was unusable with so many pages under all platforms and completely
unusable under Mac. Replace it with wxChoicebook which allows to select any
page quickly instead of having to do it sequentially (or not being able to do
it at all under Mac).

Another possibility could be to use wxTreebook and organize the pages in
categories, similarly to how it is done in the widgets sample.

Closes #3699.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 14:34:12 +00:00
Vadim Zeitlin
85edc04591 Rearrange xrc sample controls in alphabetical order.
Several new pages were added in random positions, rearrange them to be in
alphabetical order.

Also remove wxToolBar from "The Rest" page as it is shown in one of the other
pages now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 14:34:05 +00:00
Vadim Zeitlin
40730ad17d Make it easier to define custom wxSizerXmlHandler subclasses.
No real changes but refactor wxSizerXmlHandler to make it easier to derive
from it by adding virtual IsSizerNode() and DoCreateSizer() methods. To add
support for a custom sizer class you only need to override them in
wxSizerXmlHandler subclass now.

Also document wxSizerXmlHandler which was not documented at all previously.

Closes #11845.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 14:33:58 +00:00
Vadim Zeitlin
8ec22772d0 Make wxXmlResourceHandler::IsOfClass() static.
This simple helper function doesn't use any wxXmlResourceHandler data as it's
just a trivial wrapper for wxXmlNode::GetAttribute().

Making it static allows, in particular, to call it from const member functions
of wxXmlResourceHandler-derived classes (making it "const" itself would
achieve this too, of course, but it just doesn't need to be non-static).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 14:23:56 +00:00
Vadim Zeitlin
9b307a69b3 Add wxIcon::GetSize() to wxIcon in wxOSX.
This fixes the compilation errors under OS X after r65884 due to the lack of
this method there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 21:47:22 +00:00
Vadim Zeitlin
c5d7b7d20b Don't use non-existent icon in XRC sample.
appicon.xpm was removed so use another icon in the controls demo in the sample
instead, it doesn't matter which one we use anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 18:56:37 +00:00
Vadim Zeitlin
4689441b05 Add XRC handler for wxToolbook.
Closes #11615.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 18:56:28 +00:00
Vadim Zeitlin
fe97acf0e3 Don't assume any particular default size for XRC image lists.
Let the image list deduce its size from the first bitmap in it. This is better
than the old behaviour of using the standard icon size as it allows to omit
the size from the image lists provided they contain the bitmaps of the same
size.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 18:56:13 +00:00
Vadim Zeitlin
814bfbb9c0 Correct wxDialog::SetAffirmativeId() documentation.
The return value of ShowModal() is the affirmative id and not wxID_OK, of
course.

See ##11413 (specifically comment 5).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 18:56:06 +00:00
Vadim Zeitlin
df191bfe39 Added wxThread::OnKill() and OnDelete() callbacks.
Call OnXXX() from wxThread::Kill() and Delete() respectively to allow the
thread being terminated perform some cleanup.

Closes #9046.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:10:12 +00:00
Vadim Zeitlin
ec2c85bf79 Construct paths using wxFileName in wxHTML help.
Use wxFileName instead of more complicated and error-prone manipulations with
strings.

Closes #12602.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:10:05 +00:00
Vadim Zeitlin
7f75598947 Use rpmbuild to build the RPMs in "make rpm" target.
In recent versions of rpm rpmbuild must be used for building the RPMs instead
of rpm itself.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:09:57 +00:00
Vadim Zeitlin
b3706b40d2 Add more headers to "make dist" and remove .mo files.
Add wx/persist headers to the list of files used by "make dist" and remove the
message catalogs which shouldn't be part of the source distribution.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:09:49 +00:00
Vadim Zeitlin
f5ee20ccd3 Include wxscintilla library in wxGTK RPM.
Include libwxscintilla.a for static linking.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:09:43 +00:00
Vadim Zeitlin
7a2c0dd904 Generate the full list of wxBase headers paths in wxGTK.spec.
Instead of hardcoding the list of wxBase headers path, build it automatically
from the list of their base names which is generated by bakefile and so is
always up to date.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:09:39 +00:00
Vadim Zeitlin
a2d2cb04ee Force the use of GNOME printing support and wxMediaCtrl in wxGTK RPMs.
Explicitly enable the use of GNOME printing and media control to ensure that
RPMs are always created with these features enabled.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:09:34 +00:00
Vadim Zeitlin
bae3556dbf Remove "release" suffix from wx-config links used in RPMs.
We don't distinguish debug and release builds under Unix any more in 2.9 and
don't use "release" and "debug" suffixes in full wx-config names. Remove these
suffixes from the wx-config links created by RPM post-installation step.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:09:27 +00:00
Vadim Zeitlin
1bcde56c8d Document that wxProcess::GetOutputStream() can't be used after CloseOutput().
As closing the output stream makes it unusable, it is destroyed as well and so
GetOutputStream() returns NULL after calling CloseOutput().

Closes #12605.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:09:21 +00:00
Robert Roebling
e3d358bbe4 wxDataViewCtrl::Expand() only works on items whose parents are already
expanded. The attached patch fixes this by expanding all ancestors of the
 item before expanding the item itself. Closes #12585: wxDataviewCtrl::Expand() needs to expand all ancestors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:03:18 +00:00
Robert Roebling
3d9bff2f13 Set focus to generic wxDataViewCtrl when clicking with any mouse button, not just left, closes #12586: wxDataviewCtrl only gets focused on left mouse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:00:15 +00:00
Robert Roebling
cd7715602b Implement wxDataViewCtrl::HitTest() under GTK+, second part of #12582: enhancing wxDataViewCtrl, closes #12582
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 13:53:31 +00:00
Robert Roebling
08a379c575 Also set mouse position in ITEM_BEGIN_DRAG event in wxDataViewCtrl under GTK+, part of #12582: enhancing wxDataViewCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 13:48:15 +00:00
Michael Wetherell
0dffa8059d Change the return code of the test program so that aborting a test with an
exception doesn't count as a failure, to provide a way to skip tests that
can't be performed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 22:15:07 +00:00
Michael Wetherell
c5084fff34 Add debugging info to the trunk Linux builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 22:12:00 +00:00
Vadim Zeitlin
3b5c96639b Enable ListBoxTestCase::HitTest() for wxGTK.
wxListBox::HitTest() does work in wxGTK but we need to realize the control
before using it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 16:33:43 +00:00
Vadim Zeitlin
5effc1cf58 Restore the note about auto-repeat in key events documentation.
Closes #12598.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 16:33:38 +00:00
Vadim Zeitlin
1d91908363 Use GTK_SELECTION_BROWSE instead of SINGLE for wxListBox in wxGTK.
A single-selection listbox must always have a selected item, at least after
initial selection is done, i.e. its selected item can't be deselected. This
behaviour corresponds to GTK_SELECTION_BROWSE style in GTK+.

Closes #2549.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 16:33:29 +00:00
Vadim Zeitlin
a0fe77034b Fixes for calling Enable() on children of a disabled TLW in wxMSW.
The change of the child window state wasn't reflected immediately if it was
done while the TLW itself was disabled but only happened when it was
reenabled and in some cases the child could not be enabled even then.

Fix this by updating the child state immediately, even when its TLW parent is
disabled and only skip the update of the children state when TLW is being
disabled, not when it's enabled back.

Closes #11622.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 14:17:48 +00:00
Vadim Zeitlin
1af292a686 Use single BeforeLast() call in wxConfigPathChanger ctor.
Use a single BeforeLast() call with the "rest" argument and avoid calling
AfterLast() laster in wxConfigPathChanger ctor.

This is a small optimization which may count because wxConfigPathChanger is
used in a lot of wxFileConfig functions but, even more importantly, this works
around a bug in g++ 4 optimized build when the name was not filled by
AfterLast() call correctly as apparently the optimizer decided it was not
used. The real cause of this compiler bug was difficult to find as it couldn't
be reproduced in a simple test case but this change avoids it and fixes
wxFileConfig unit test in optimized build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 14:17:42 +00:00
Vadim Zeitlin
6becc1e617 Added "rest" argument to wxString::Before{First,Last}().
This allows to search the string just once, in BeforeXXX(), when both the
parts of the string before and after some character are needed instead of
having to do it twice in both BeforeXXX() and AfterXXX().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 14:17:37 +00:00
Vadim Zeitlin
f48a115976 No real changes, just use const_cast<> instead of C casts.
Replace many comments indicating that the C cast used was really a
const_cast<> with the proper cast itself. There is no reason to not use it any
longer, all the supported compilers understand it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 14:17:30 +00:00
Vadim Zeitlin
9513aa80ce Don't add quotes to string representation in gdb.
gdb adds quotes itself around string values so don't duplicate them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 14:17:22 +00:00
Vadim Zeitlin
53dfbfa5c9 Add missing comparison operator declarations in wxString::iterator.
Fix compilation in !wxUSE_UNICODE_UTF8 case after r65857.

Modify the second declaration of wxString::iterator class which was not
updated by the previous commit in the same way, i.e. add declaration of
comparison operators taking const_iterator to iterator class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-21 19:51:40 +00:00
Vadim Zeitlin
51c30bca93 Document the meaning of wxToolBar tool id more clearly.
Make it clear that the id is the same one as was passed to AddTool().

Closes #12597.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-21 19:44:23 +00:00
Vadim Zeitlin
bdb40fa63e Implement comparisons between wxString::iterator and const_iterator.
Only comparisons between const_iterator and iterator worked before (because of
implicit conversion from the latter to the former), implement the ones in the
other direction explicitly now.

Closes #12594.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-21 19:22:33 +00:00
Vadim Zeitlin
53cdd2c11d Add XRC handler for wxCommandLinkButton.
Added a handler for wxCommandLinkButton class and a demo of it in the xrc sample.

Closes #12593.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-20 23:11:20 +00:00
Vadim Zeitlin
528f2a25ca Merge wxBitmapButton and wxButton panels in the xrc sample.
There are already way too many pages in the "Controls Example" in the sample,
combine wxBitmapButton and wxButton ones to save some space and make it more
usable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-20 23:11:09 +00:00
Vadim Zeitlin
4d9d127f45 Correct the fix that broke wxRegion::ConvertToBitmap().
The changes in r64874 were incorrect and made the size of the bitmap even
more wrong than before. Fix it correctly now by just adding 1 extra pixel to
the size of the bitmap used in the original (pre-r64874) version.

Closes #12213.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-20 23:11:04 +00:00
Peter Cawley
140091e55c Improve support for ribbon panel sizers: panels with sizers should now automatically minimise at small sizes, and behave properly when popping up from a minimised state.
Patch by johnr in trac issue #12580.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-20 17:49:42 +00:00
Michael Wetherell
ab3332517f Check for window manager before running GUI tests on unix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-20 13:08:32 +00:00
Vadim Zeitlin
02a4d0b7a0 Change wxSP_XXX flags values to avoid clashes with wxTE_XXX.
wxSP_ARROW_KEYS conflicted with wxTE_AUTO_URL (which was probably not
important in practice as URLs don't appear in spin controls anyhow) and wxSPWR
conflicted with wxTE_NOHIDESEL (which could conceivably be a problem).

Change their values to reuse the bits of wxTE_CHARWRAP and wxTE_RICH2 neither
of which definitely makes sense for a spin control.

Closes #11461.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-18 23:43:25 +00:00
Vadim Zeitlin
1780a38b7b Use unsigned char for XBM bitmaps data.
This fixes compilation with g++ in C++0x mode in which conversions of
constants not fitting into signed char range to char are not permitted.

Closes #12575.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-18 23:43:20 +00:00
Vadim Zeitlin
40f48834fc Correctly handle S_FALSE return value of IActiveMovie::get_Duration().
IActiveMovie::get_Duration() can return S_FALSE in which case outDuration
isn't initialized and so wxAMMediaBackend::GetDuration() would return a
completely wrong value.

Fix this by returning 0 from it instead which seems like the only reasonable
thing to do (in the absence of documentation of this interface it's not really
clear what does S_FALSE return value mean nor why didn't it return it before).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-18 23:43:14 +00:00
Vadim Zeitlin
a8b3cea302 Correct recently broken checked state handling in wxRearrangeList.
The checked state of them wasn't preserved correctly any more since r64875,
correct this by changing the state only after storing the old one.

Closes #12578.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-18 23:43:09 +00:00
Vadim Zeitlin
bb7cd76766 Add missing "static" to wxSystemOptions::SetOption() documentation.
Closes #12576.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-18 23:43:02 +00:00
Jaakko Salli
769ede722a Call wxScrollHelper::AdjustScrollbars() to fix scroll bar setup that broke after wxPropertyGrid was changed to inherit from wxScrollHelper instead of wxScrolledWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-18 13:55:40 +00:00
Vadim Zeitlin
35f8d83dbb Fix wxSTC compilation without wxUSE_DRAG_AND_DROP after r65827.
Correct the changes of r65827 to also compile with wxUSE_DRAG_AND_DROP==0
(especially important for the ports without dnd support such as wxX11 and
wxDFB).

Also do the changes in the correct files, i.e. src/stc/stc.{h,cpp}.in and not
in the generated files themselves to prevent them from being overwritten the
next time gen_iface.py is ran.

Finally keep backwards compatibility as SetDragAllowMove(bool) is a public
method so preserve its old semantics and add a new SetDragFlags() instead of
silently breaking the existing code using SetDragAllowMove().

See #11709.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-17 18:17:30 +00:00
Michael Wetherell
5f8bf0ee6f Disable the Mingw x64 builds as there's no compiler.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-17 14:06:30 +00:00
Vadim Zeitlin
dbd92d3d0c No real changes, just fix a warning in the test suite.
Don't assign wxNO_LEN to int variable, this results in gcc warnings about
overflow in implicit constant conversion.

Use size_t for the variable containing string length to fix it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-17 13:59:55 +00:00
Vadim Zeitlin
e3cd024e85 Revert the changes of r65826 in wxConvertToGTK().
This is not necessary any longer after the previous commit which changed
cMB2WC() to not return NULL for empty input.

See #12432.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-17 13:59:48 +00:00
Vadim Zeitlin
cfcfada96e Return valid buffer from wxMBConv::c{MB,WC}2{WC,MB} for empty input.
Returning invalid buffer for empty input is unexpected and resulted in e.g.
wxString::utf8_str() returning NULL and not "" in ANSI build for empty strings
(which, in turn, resulted in crashes in the test suite and undoubtedly not
only) as well as crashes when calling GTK+ functions (see #12432). Other uses
of cMB2WC() also show that NULL return value from it is unexpected as it is
often passed to CRT functions not accepting NULL.

So return empty buffer instead for empty input to avoid all these problems.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-17 13:59:42 +00:00
Vadim Zeitlin
24b4db9b0d Fix FileTestCase to really test strings with embedded NULs.
The test was intended to verify that round trip via wxFile::Write/Read()
worked even for the strings with embedded NULs but as the string wasn't
constructed correctly it didn't actually contain any NULs but was ended by the
first of them.

Fix this by using explicit length of the string as usual when dealing with
strings with embedded NULs. Also fix the conversion back to Unicode to use the
correct length.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 23:05:26 +00:00
Vadim Zeitlin
a9f3fb07a0 Disable tests for UTF-encoded files in FileTestCase in ANSI build.
These tests didn't work correctly in ANSI build because the conversion
parameter of wxFile::Write() isn't used there, the contents of an ANSI
wxString is always written to the file as is -- hence reading it back using
UTF-16 or UTF-32 conversion fails.

The test would need to be totally rewritten for ANSI build of wx and it
wouldn't test wxFile but rather conversion functions already tested elsewhere
so just disable it instead.

This fixes a crash (due to passing NULL pointer to memcmp()) which prevented
the test suite from running to completion in ANSI build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 23:05:20 +00:00
Vadim Zeitlin
b37e255c36 Compilation fix for STL build after r65830.
Explicit conversion from wxString to "const char *" is needed in STL build.
And even in non-STL build it's wrong to rely on implicit conversion as it
wouldn't work correctly in non-UTF-8 locales.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 23:05:15 +00:00
Vadim Zeitlin
a9544d0014 Avoid crashes in wxGenericListCtrl client<->screen conversion code.
At least in wxUniv build, DoScreenToClient() can be called before the main
control window is created which results in a crash when attempting to forward
to its DoScreenToClient() version.

Check for m_mainWin being non-NULL before using it to at least avoid the
crash, even if it's not really clear whether this is a 100% correct fix.

Closes #12390.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:11:32 +00:00
Vadim Zeitlin
9e19da0f2a Improve wxGTK print and page setup dialogs.
Handle more fields (notably collation, number of copies and "print to file"
flag) and fix the bug with return value of print dialog ShowModal().

Closes #12499.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:11:27 +00:00
Vadim Zeitlin
34b2bc598b Transfer printer name to/from GTK+ native print setup dialog.
Printer name in the GTK+ dialog was neither initialized nor retrieved before.

See #12499.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:11:21 +00:00
Vadim Zeitlin
820ec9bbc2 Correctly initialize wxGtkPrintNativeData members.
In particular, create a valid GtkPrintOperation object instead of using an
uninitialized pointer to it in wxGtkPrintDialog::ShowModal(), resulting in
crashes or, at best, GTK errors.

Closes #12483.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:11:15 +00:00
Vadim Zeitlin
676184202d Restore text drag-and-drop in wxSTC broken by Scintilla 2 update.
Drag and drop in wxStyledTextCtrl was broken, apparently since upgrade to
Scintilla 2. Restore it by using the correct wxDrag_XXX constants instead of
boolean values in the code for wxEVT_STC_START_DRAG events generation.

Closes #11709.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:11:06 +00:00
Vadim Zeitlin
dd5ab30d6a Don't return invalid buffer from wxConvertToGTK("").
The result of wxConvertToGTK() is often passed to GTK+ functions directly and
not all of them handle NULLs gracefully, e.g. gtk_editable_insert_text() just
crashes.

Return an empty string from wxConvertToGTK() explicitly for empty string input
to avoid such problems.

Another potential solution might have been to change wxMBConv::cMB2WC() to
return empty buffer instead of invalid one for empty input but it's not clear
if this is not going to break something else.

Closes #12432.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:10:58 +00:00
Vadim Zeitlin
817b7b0e87 Add wxHAS_3STATE_CHECKBOX symbol.
This symbol is defined for the ports that support wxCHK_3STATE style. While
most of the ports do support it, a couple still do not and having this symbol
makes it more convenient to exclude 3-state-checkbox-specific code, like in
CheckBoxTestCase.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:10:51 +00:00
Vadim Zeitlin
f254e2424a Improve validation of wxCheckBox styles.
Detect when incompatible styles are used (this required changing the value of
wxCHK_2STATE to be non-null) and sanitize the styles (after asserting) in this
case.

Put the validation code in wxCheckBoxBase instead of having slightly different
versions of it in port-specific wxCheckBox implementations.

Add a unit test checking that the expected asserts are indeed generated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:10:42 +00:00
Vadim Zeitlin
a9df18b4e4 Put libraries in %{_libdir} when building wxGTK RPMs.
Using the default libdir value ${_prefix}/lib is not always appropriate,
notably this takes care of systems using /usr/lib64 instead of /usr/lib.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:10:32 +00:00
Julian Smart
9be7f47cf4 Disabled wxRTC tests that don't work in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 10:24:42 +00:00
Vadim Zeitlin
97e5b0645e Clear selection when generic wxDataViewCtrl is cleared.
Selection could retain its old value and become invalid after calling Reset()
before.

Closes #12559.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:51 +00:00
Vadim Zeitlin
e6777e6575 Add wx{Pen,Brush}::Is[Non]Transparent() methods and use them.
Using GetStyle() == wx{PEN,BRUSH}STYLE_TRANSPARENT doesn't work for
uninitialized pen or brush objects so add convenient helpers which do work for
them.

Use the new helper functions everywhere instead of explicitly checking for
style. This makes the code shorter and more clear and also fixes some bugs (at
least those in GTK printing code).

Notice that this patch removes the main reason for explicitly initializing
m_pen and m_brush in wxGTKDCImpl ctor but this initialization still can't be
removed, at least for the latter, as doing this somehow breaks GetPixel(). It
would be nice to understand why and do remove this initialization so that a
newly created DC doesn't have any non-default pen nor brush.

Closes #12522.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:46 +00:00
Vadim Zeitlin
f8ce98ded0 Use wxDCPenChanger instead of setting/resetting pen explicitly.
No real changes, just use wxDCPenChanger instead of manual calls to SetPen()
in wxDCImpl::DrawPolygon(). This makes the code shorter and more clear.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:37 +00:00
Vadim Zeitlin
bce926c580 Add "GTK" prefix to wxChoice::{Dis,En}ableEvents() methods in wxGTK.
This is more than a cosmetic change: adding "GTK" prefix in wxComboBox and not
doing it in wxChoice in r64436 broke the event generation for wxComboBox as it
didn't override wxChoice methods any longer but defined its own (useless) ones.

Using the same name for the methods in both classes notably fixes unexpected
event generation from wxComboBox::SetSelection().

Closes #12568.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:32 +00:00
Vadim Zeitlin
489f5a3d2e Include wx_presets.py in the distribution made by "make dist".
This file is required by "make install".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:24 +00:00
Vadim Zeitlin
5b1985a920 Check for task dialog availability even under Vista and later.
Task dialogs are not always available under Vista and later Windows versions
because we might not be using the right (i.e. 6+) version of comctl32.dll.

Improve the check for task dialog availability and fall back to the classic
message box if we can't use it.

Closes #12553.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:19 +00:00
Vadim Zeitlin
eead52913d Remove all mentions of non-existent contrib from .spec files.
Remove contrib packages from .spec files.

Closes #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:13 +00:00
Vadim Zeitlin
2f22b9c260 Add libraries new in 2.9 to wxGTK.spec.
Add propgrid, ribbon and stc libraries. Correct the name of the media library
("mmedia" was an old contrib library name that doesn't exist any more).

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:09 +00:00
Vadim Zeitlin
1a9e575d79 Fix GTK+ development RPM dependency in wxGTK.spec.
Apparently the standard name for this RPM is gtk2-devel and not
gtk+-2.0-devel, at least rpmfind.net database doesn't have any matches for the
latter and plenty for the former.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:04 +00:00
Vadim Zeitlin
5d3056f180 Fix button order in wxGTK wxMessageDialog and wxStdDialogButtonSizer.
The order of buttons in wxGTK wxMessageDialog was accidentally broken since
r55482 and wxStdDialogButtonSizer implementation for wxGTK was subsequently
modified to work in the same way as the broken version of wxMessageDialog.

Fix wxMessageDialog and remove the "compatibility" workarounds from
wxStdDialogButtonSizer to restore correct behaviour in both places.

Closes #12565.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:45:58 +00:00
Jaakko Salli
ec31b41de3 Fix non-PCH builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 15:49:00 +00:00
Jaakko Salli
76c722f697 Added the missing DLL export declaration for wxNumericPropertyValidator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 15:18:40 +00:00
Jaakko Salli
026767c6ae Added wxNumericPropertyValidator, which is a custom wxTextValidator with more accurate filtering of inappropriate input for wxIntProperty, wxFloatProperty and wxUIntProperty (fixes #12563).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 15:15:27 +00:00
Julian Smart
5ad9ae3a29 Fixed #12566 (assert on deletion) due to inconsistent commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-14 18:06:02 +00:00
Vadim Zeitlin
eb7a47b7b9 wxUniv/MSW compilation fix.
wxUniv/MSW compilation was broken by r65589, fix it by not assuming that
wxWindowMSW is a wxWindow because wxWindow derives from it in wxUniv.

Closes #12534.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 23:08:47 +00:00
Vadim Zeitlin
0d20ccbd5e Regenerate Makefile.in after recent changes to make_dist.mk.
Rebake with changes of r65800, r65801 and r65802.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 23:02:50 +00:00
Vadim Zeitlin
5b84e5273b Remove obsolete files from "make dist" rules.
Avoid errors due to attempts to copy non-existing files when making Unix
distribution.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:53:54 +00:00
Vadim Zeitlin
d5cbcec97d Skip Windows-only samples when making Unix distribution.
Some samples are by definition Windows-only so they don't have Makefile.in
files for Unix at all, skip them when creating the Unix distribution to avoid
errors due to attempts to copy non-existent files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:53:50 +00:00
Vadim Zeitlin
caf019265a Include include/wx/generic/private/*.h files in distribution.
We must include the generic private files into the distribution as well,
otherwise at least wxGTK fails to build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:53:45 +00:00
Vadim Zeitlin
cff48ba847 Fix display of right aligned columns in wxGenericListCtrl.
Take into account the width of the image when drawing the right aligned item
in wxGenericListCtrl.

Closes #12562.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:10:45 +00:00
Vadim Zeitlin
71d6cd60ee Pass last page in wxEVT_WIZARD_FINISHED event.
Delay resetting the wizard page to NULL when it terminates to allow
wxEVT_WIZARD_FINISHED event to carry the correct pointer to the last page.

Closes #12537.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:10:39 +00:00
Vadim Zeitlin
b7c31456fe Fix print format specifiers used for enum values.
Enums are ints, not longs, so use %d instead of %ld to avoid asserts under LP64
64 bit architectures.

Closes #12556.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:10:33 +00:00
Vadim Zeitlin
12f6edffd4 Don't return "false" when a pointer is needed.
Return NULL and not false from wxFileTranslationsLoader::
GetAvailableTranslations().

This is, of course, more correct and also fixes a compilation problem with
Borland, see #12558.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:10:28 +00:00
Vadim Zeitlin
20d88ec692 Move wxList::Member() to pseudo-template base list class.
Member() should be available in all list classes, not just specially crafted
list of wxObjects (wxList).

See #3616.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-10 12:48:36 +00:00
Jaakko Salli
ed8b46bba3 When wxPGProperty is un-attached from wxPropertyGrid, keep its 'default' cell references invalid/NULL (fixes #12552)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-10 09:34:29 +00:00
Jaakko Salli
b3ecee8d12 Also reset DatePicker property editor's global pointer (fixes #11787)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-10 08:32:58 +00:00
Julian Smart
32742d3d9d Compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-08 22:17:14 +00:00
Julian Smart
c06f56dd1a Blind fix for Mac compile problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-08 21:51:44 +00:00
Michael Wetherell
15552854db Fix for wxChm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-08 11:16:54 +00:00
Vadim Zeitlin
b457256985 Don't use default "Error" title for wxMessageOutputBest message box.
Use the application display name as the message box title if possible andu se
"Message" rather than "Error" otherwise.

See #12548.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-07 20:57:40 +00:00
Vadim Zeitlin
6e91bf4d5b Remove unnecessary check from IPC sample.
No real changes, just remove a check for pointer passed to wxDELETE() bot
being NULL as wxDELETE() already checks for this anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-07 20:43:20 +00:00
Julian Smart
8995db52f3 Don't use wxDC in header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-06 21:27:07 +00:00
Julian Smart
bec80f4f4a Eliminated redundant wxRichTextAnchoredObject class; refactored XML I/O code
so that objects can stream themselves; added a wxXmlDocument-based method
of writing XML, though this turned out to be much slower than writing directly
so the direct approach is retained and is the default (can be changed with wxRICHTEXT_USE_XMLDOCUMENT_OUTPUT).
Loading and saving new attributes implemented. Added custom properties to objects.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-06 20:22:03 +00:00
Julian Smart
2d55af1dfa More efficient access to name and value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-06 13:15:24 +00:00
Vadim Zeitlin
93f6e00d7b Destroy the in-place edit control in wxGenericListCtrl dtor.
If the in-place text control was still alive when wxGenericListCtrl was
destroyed, it resulted in asserts from wxWindow dtor about child windows still
being alive, so explicitly destroy it from wxListMainWindow dtor.

As this required a slightly different behaviour from wxListTextCtrlWrapper::
EndEdit(), replace its bool argument with an enum one which can take more than
2 values. Not using bool values when calling it also made the code more clear.

Finally, added a unit test verifying that the in-place control is indeed
destroyed correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-05 13:38:05 +00:00
Vadim Zeitlin
9a1ff9516c Disable TimerEventTestCase::Multiple() test for ANSI wxGTK build.
This test crashes for unknown reasons on wxGTK ANSI build slave and prevents
the rest of the test suite from running, so disable it for now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-05 13:37:44 +00:00
Vadim Zeitlin
d275b15d14 Fix harmless unused variables warnings.
Don't initialize the variables we never use in richtext sample, this results
in g++ warnings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-05 13:37:25 +00:00
Julian Smart
f13d956e6a Removed test code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-05 06:33:34 +00:00
Julian Smart
30f6914ba1 Added a flag suppressing node content conversion when saving to XML.
This helps improve the extremely poor performance of XML saving if
you have, for example, hex data that does not need conversion.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-05 06:17:22 +00:00
Julian Smart
6ffb5e91ea Exports fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 12:25:27 +00:00
Jouk Jansen
16c6c036d3 Update OpenVMS Makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 12:20:45 +00:00
Vadim Zeitlin
33f7fa342f Don't throw assert failure exception in the test suite if it's unsafe.
Don't throw when already handling an exception as it would result in a call to
terminate() and no useful information about the test failure would be given.
Abort ourselves instead to at least give the message about the assert failure.

This should help debug the mysterious ListCtrlTestCase failures in buildbot
wxGTK builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 10:53:37 +00:00
Vadim Zeitlin
6222ad281a Fix timing format string in the test suite.
wxStopWatch::Time() returns a long value so use %ld, not %d.

This fixes assert failure when using "-t" option with the test suite under 64
bit Unix architectures.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 10:41:44 +00:00
Vadim Zeitlin
fa38073670 Fix tests compilation with wxUSE_TOOLTIPS==0 as in wxX11.
Unit test suite didn't compile in wxX11 build because it doesn't support
tooltips, just disable the relevant test then.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 10:41:39 +00:00
Julian Smart
f5b7586bfe Removed redundant GetEditableWindow on GTK+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 09:27:52 +00:00
Julian Smart
2477747881 wxRTC no longer derives from wxTextCtrlBase; added wxRichTextAttr deriving from wxTextAttr
with CSS-like attributes for future developments; removed image-specific attributes object


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 08:37:31 +00:00
Julian Smart
1d12c6e2be Avoid id clashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 08:10:27 +00:00
Vadim Zeitlin
97e07b1cd9 Fix wchar_t with int comparisons for Apple gcc.
Apple gcc refuses to compile comparisons between wchar_t and int for some
reason, so add explicit casts to int to make it work there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 22:24:03 +00:00
Vadim Zeitlin
c4cb46c1eb Fix wxUSING_VC_CRT_IO definition in the tests when not using MinGW.
The condition was always true for non-MinGW compilers because of a missing
pair of parentheses, do add them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 22:23:57 +00:00
Vadim Zeitlin
864299f799 Fix gcc warnings about comparing iterators with NULL in STL build.
Iterators are not pointers and shouldn't be compared to NULL.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 22:23:51 +00:00
Vadim Zeitlin
b7ff06ad15 Fix use of DELETE and BACKSPACE when starting editing grid with them.
Using the current insertion position in wxGridCellTextEditor::StartingKey()
didn't make much sense, it was always 0 -- so DELETE worked as expected and
did delete the first character of the cell but BACKSPACE never did anything.

Just always delete the first character when DELETE is used and always delete
the last one when BACKSPACE is.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:34:22 +00:00
Vadim Zeitlin
6a1e8a634a Fix non-ASCII key handling in wxGrid editors.
Use wxKeyEvent::GetUnicodeKey() correctly, there is no need to guess about
what does it return now that its correct behaviour is documented and
implemented. Simply check if it returns WXK_NONE to check for non-characters.

Also use WXK_START instead of hard-coded 255 when checking GetKeyCode()
result.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:34:15 +00:00
Vadim Zeitlin
2c5c9c27de Disable the use of __thread with MinGW.
__thread keyword doesn't work correctly with at least some MinGW builds and in
particular TLS unit tests failed with the official 4.4 version.

Disable the use of __thread with MinGW entirely for now to be sure that the
generated code behaves correctly. In the future we should white list the known
good versions of MinGW and/or use run-time test for __thread support in
configure instead of compile-time one only.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:16:15 +00:00
Vadim Zeitlin
1b2f7b6d75 Update CRT environment in wxSetEnv() for MinGW too.
MinGW uses the same CRT as MSVC so we can use the same _putenv() call for it
too. This ensures that wxGetenv() returns the value updated by wxSetEnv() and
fixes CrtTestCase::SetGetEnv() unit test when using MinGW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:16:09 +00:00
Vadim Zeitlin
43f8864bb0 Use wxUSING_VC_CRT_IO for MSVC CRT-specific test results.
Move USING_VC_CRT into testprec.h to allow its reuse in other files and rename
it to wxUSING_VC_CRT_IO as it only checks whether we're using MSVC STDIO
implementation and could be false even when we are otherwise using MSVC CRT.

Use this symbol for the tests whose result depends on the concrete version of
the CRT we use.

This fixes StringTestCase::FromDouble() failure under MinGW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:16:00 +00:00
Vadim Zeitlin
cb5eef9d87 Fix DirTestCase to run on the systems without "C:" drive.
"C:" drive doesn't need to exist under Windows, rely on HOMEDRIVE environment
variable defined in all recent Windows versions to get a valid drive letter
(still fall back to "C:" if the variable is not defined -- we could have use
wxFSVolume to find it then but this seems like an overkill).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:15:52 +00:00
Vadim Zeitlin
12249b199d Run MBConvTestCase::LibcTests() only for MSVC and not other Windows compilers.
This test fails for MinGW, probably because its CRT doesn't use the same
locale names as MSVC CRT. Just disable it for now, as it was already disabled
for non-MSW platforms.

Also use LocaleSetter class (extracted from CLocaleSetter) to change the
locale for this test duration only to avoid affecting any tests running after
it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:15:46 +00:00
Vadim Zeitlin
5d509cacfb Show the failing string when conversion fails in MBConvTestCase.
No real changes, just give more information when a test fails in
MBConvTestCase::TestDecoder().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:15:37 +00:00
Vadim Zeitlin
cbc2233eb9 No real changes, just simplify some MBConvTestCase code.
Remove unnecessary casts and initialize the variable with its contents
directly instead of using strange looking wxWCharBuffer ctor from size_t (even
if it did work, it was unnecessary).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:15:31 +00:00
Vadim Zeitlin
3cfa70b71a Exclude tests relying on last error being set under MinGW.
The value of the last error seems to change somewhere between our code and
::GetLastError() call, probably in MinGW CRT, so exclude the tests relying on
it being preserved.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:15:24 +00:00
Vadim Zeitlin
9334ad1727 Correct wxConvAuto::ToWChar() behaviour with wxNO_LEN input size.
We didn't handle the case when the length of the input buffer was not
specified correctly and wxConvAuto::DetectBOM() could read beyond the end of
input. Moreover, the unit test actually relied on this as it didn't pass the
correct length for the literal strings with embedded NULs. This somehow worked
with MSVC but failed with MinGW (see #10713).

Correct the code to handle wxNO_LEN case correctly and fix the unit test to
pass the correct lengths.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:15:18 +00:00
Vadim Zeitlin
051d655703 Fix VsnprintfTestCase for recent MinGW versions.
MinGW now uses its own printf() implementation which handles %p differently
from the VC CRT one and uses %8x instead of %8X for it. Compare the results of
wxPrintf("%p") case-insensitively to let the test pass in any case.

Also introduce a USING_VC_CRT macro instead of testing for
__USE_MINGW_ANSI_STDIO in two different places.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:15:10 +00:00
Vadim Zeitlin
89ff7e9fb1 Remove redundant wxUSE_WXVSNPRINTF checks from the unit test.
The entire VsnprintfTestCase is only used when using our own
wxUSE_WXVSNPRINTF so remove the redundant tests for it inside the enclosing #if.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:15:04 +00:00
Vadim Zeitlin
6acd08bc95 Fix tests compilation without wxUSE_REGEX.
Don't build wxRegEx unit tests when wxUSE_REGEX == 0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:14:57 +00:00
Vadim Zeitlin
4cfee1efef Suppress harmless g++ 4.4 warnings about missing braces.
Put braces around MSW-only wxLogXXX() calls to avoid warnings when building
with MinGW 4.4+.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 17:14:08 +00:00
Jaakko Salli
a9afb0576c In wxBitmapComboBox::RecreateControl(), always get recreated control's height from the best size, and also set the ComboBox item height with CB_SETITEMHEIGHT message (fixes #12515).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-03 10:51:50 +00:00
Tim Kosse
864186dd39 Connect to events only if using native implementation instead of using event table. Closes #12469
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-02 09:39:58 +00:00
Vadim Zeitlin
df53be12c5 Add non-vararg wxFileTypeInfo ctor and various setters.
This allows to create wxFileTypeInfo objects in a more readable even if more
verbose way.

This should also incidentally fix the unit tests compilation with VC6 which
seems to have some existential troubles with the vararg ctor in debug DLL
build (only). Using the non-vararg ctor should hopefully make it happy and let
the unit tests pass with this compiler.

Also document wxFileTypeInfo class which wasn't documented at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-01 13:05:42 +00:00
Vadim Zeitlin
323d36e452 Add wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.
Not all ports define wxBitmapToggleButton class currently, so add a special
symbol which is defined only if this class is indeed available and test for it
in the unit test for this class.

This fixes the tests compilation under wxX11.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-01 13:05:36 +00:00
Vadim Zeitlin
e2032c2e21 Disable ItemClick() unit test for wxListCtrl under wxMSW.
This test just doesn't want to work on MSW buildbot slaves even though it
works perfectly locally. No idea why but disable it when running on a build
bot slave for now to let the entire test suite pass.

Also add a comment explaining why the test is disabled for wxGTK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-01 13:05:30 +00:00
Vadim Zeitlin
0c6a98a443 Disable wxEVT_COMMAND_LIST_ITEM_FOCUSED test for wxMSW.
This test fails on MSW buildbot slaves for unknown reasons so disable it to
make the test suite pass. The failure is irreproducible locally so no idea how
to debug this unfortunately.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 17:35:01 +00:00
Stefan Csomor
4a473abaf2 opening ATSU Font info for Ulrich Telle's wxPDFContext
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 17:30:48 +00:00
Vadim Zeitlin
51b729af92 Add default value for GetPopupMenuSelectionFromUser() position argument.
Let the menu be popped up at the system-determined position, just as it can
already be done with PopupMenu() itself.

Closes #12530.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:33:53 +00:00
Vadim Zeitlin
0e555c213d Correctly convert wxPrintf() to a buffer even when it doesn't fit.
ConvertStringToBuf() helper function was defined incorrectly for converting
wxString to a char* buffer as it didn't fill the buffer at all if the string
didn't fit into it entirely instead of putting as much of the string into it
as possible as was already done for the conversion to wchar_t* buffer. This
broke wxSprintf()-related functions in when the ASCII output buffer was not
big enough as it was not filled at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:30:41 +00:00
Vadim Zeitlin
37513b6715 Correct handling of %hs and %ls in our wxPrintf() implementation.
The strings corresponding to %hs and %ls are always narrow/wide independently
of the build so using wxArgNormalizedString which is defined differently in
different builds doesn't make sense in wxPrintf().

Instead, simply expect the parameter of the appropriate matching type for
these conversion specifications. Any conversions to it, if necessary, had been
already done before by wxFormatString.

This fixes some VsnprintfTestCase::BigToSmallBuffer() unit test failures.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:30:35 +00:00
Vadim Zeitlin
e2dd624761 Fix handling of asterisks in wxPrintf() implementation.
Count the number of asterisks before modifying the string we use to do this,
otherwise we were off by one for the format specifications containing two of
them.

This really fixes the handling of asterisks (used for width/precision) in
wxPrintf() format string, it wasn't done correctly by r60120 but now
VsnprintfTestCase::Asterisk() test does pass.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:30:28 +00:00
Vadim Zeitlin
cdd233ef81 Expect an assert in wxVsnprintf() test with too many parameters.
The call to wxPrintf() should provoke an assert if there are too many
parameters, so update the test to expect it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:30:23 +00:00
Vadim Zeitlin
32f6c515fd Disable test failing under VC6 only.
Somehow the expected assert is not generated by wxString::Format("%d", ptr)
with VC6. Disable this test to make the test suite pass for VC6 for now to at
least be able to monitor the appearance of the new errors in it.

Of course, this one should ideally be debugged (by someone who is interested
in VC6 support) as well...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:30:18 +00:00
Vadim Zeitlin
1cef35cad3 Insert another item in the list control in its unit test.
For some reason the test fails with a single item in the control when running
on the buildbot slave, check if this is still the case if we add another item
to the control.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:30:13 +00:00
Vadim Zeitlin
66955cc284 Remove out of date code in DoStringPrintfV().
We can't clear a NULL buffer, the code didn't make any sense any more because
it wasn't updated when the function was changed as part of UTF-8 transition.

Closes #12529.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 14:30:06 +00:00
Michael Wetherell
348a9a6ff2 A couple of fixes for wxChm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 13:09:04 +00:00
Vadim Zeitlin
3a3349f518 More compilation fixes for new wxRTC image code without PCH.
Add more headers needed when not using PCH.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 12:30:02 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace.
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:44:45 +00:00
Vadim Zeitlin
6255fac96f Use Unix EOL format for the new files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:31:57 +00:00
Vadim Zeitlin
7132641de7 Include correct headers from richtextimagedlg.*.
Include or forward declares the classes used by the header to make it
self-contained. Do not include wx/wx.h from the source file to make compiling
it faster when not using PCH.

This fixes compilation under Unix after SOC2010_RTC_IMAGES branch merge.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:31:04 +00:00
Vadim Zeitlin
00fe363361 Remove interface/implementation #pragmas from richtextimagedlg.*.
These pragmas are not necessary and may actually be harmful, no idea why were
they added in the first place to a new file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:30:58 +00:00
Vadim Zeitlin
cdaed652d7 Merge of SOC2010_RTC_IMAGES branch.
Added floating images and image property dialog to wxRichTextCtrl, by Mingquan
Yang as part of GSOC 2010. Also changed image block creation to use a memory
stream instead of creating a temporary file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 10:27:07 +00:00
Vadim Zeitlin
9bc95da04c Correct printf() format specifiers for long variables in life demo.
Fix asserts in 64 bit builds due to using %u (expecting 32 bit values on a
typical Unix LP64 platform) for 64 bit long values.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 22:01:18 +00:00
Vadim Zeitlin
a65b84f434 Add EVT_RIBBONBAR_TAB_LEFT_DCLICK event.
Generate a special event when a ribbon bar is double clicked.

Closes #12399.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:35 +00:00
Vadim Zeitlin
4267872212 Fix crash in wxWebKitCtrl when using JavaScript.
Ignore the unknown types of the script result, in particular don't crash
trying to dereference an uninitialized pointer if the script didn't return
anything.

Closes #12361.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:24 +00:00
Vadim Zeitlin
c85a79963d Preserve page size when changing increment in wxGTK wxSpinCtrlDouble.
The page size was wrongly reset when changing the increment before.

See #12342.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:19 +00:00
Vadim Zeitlin
63fb690734 Fix wrong return value of wxGTK wxSpinCtrlDouble::GetIncrement().
Due to confusion in gtk_spin_button_get_increments() parameters order the page
size was returned instead of the increment.

See #12342.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:14 +00:00
Vadim Zeitlin
59b7da02ff Return wxFONTFAMILY_DEFAULT, not UNKNOWN, from wxFont::GetFamily().
Although returning wxFONTFAMILY_UNKNOWN when the font family is not recognized
makes more sense, it breaks a lot of existing code including all the
font-related code generated by DialogBlocks, so prefer to return
wxFONTFAMILY_DEFAULT instead -- which can't be confused for a valid font
family neither but can be passed to wxFont ctor or SetFamily() without
problems.

To ensure that this behaviour is correctly implemented by all ports, rename
the existing wxFont::GetFamily() to DoGetFamily() and call the new method from
wxFontBase::GetFamily() which adjusts the return value if needed.

Closes #12330.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:46:09 +00:00
Vadim Zeitlin
4a21ea9d9e Improve mouse handling code in wxAuiToolBar.
Capture the mouse to handle mouse input on the buttons to ensure we always
reset the button when the mouse leaves it.

Closes #11784.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:45:56 +00:00
Vadim Zeitlin
bb4acdc085 Include wx/defs.h before testing for wxUSE_RADIOBOX.
We need to include wx/defs.h that (indirectly) defines wxUSE_RADIOBOX
before testing for it in wx/radiobox.h, otherwise the test may fail if the
latter header is the first wx header included by the user code.

This is similar to r65210 fix for wxUSE_CHECKLISTBOX.

Closes #12526.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-29 13:45:51 +00:00
Jaakko Salli
1e005ad1fd Reset wxPGEditor singleton instance pointers in dtors. This is useful if wxPropertyGrid is being accessed from an external main loop.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-28 18:59:41 +00:00
Vadim Zeitlin
490e22fdd0 Replace some stray _T()s with wxT().
We use wxT() exclusively now so replace some _T()s which crept in unnoticed.

This also fixes compilation using Sun CC.

See #12452.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 12:55:28 +00:00
Vadim Zeitlin
8cb2c49f7d Fix wx/event.h compilation with Sun CC compiler.
Move wxObjectEventFunctor::operator() definition after wxEvtHandler
declaration as it uses call through a pointer to member of this class and Sun
CC refuses to compile this without having the full class declaration.

Closes #12452.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 12:55:22 +00:00
Vadim Zeitlin
0b2a860f0d Use wxString methods for UTF-8 conversions in wxX11 code.
Use wxString::utf8_str() and FromUTF8() to convert to and from UTF-8. This is
more efficient than using wxConvUTF8 as the code did before as it avoids the
conversion entirely when wxString uses UTF-8 internally (as it does by default
in wxX11) and also has the advantage of compiling in STL build unlike the old
code.

Closes #12518.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 12:48:21 +00:00
Vadim Zeitlin
02e2609962 Small clean up in wxX11 Pango code.
Don't use unnecessary explicit casts of wxCharBuffer to "const char *".

Use wxCharBuffer::length() instead of strlen().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 12:48:14 +00:00
Vadim Zeitlin
80f4c79642 Fix wxX11 compilation when using PCH.
wx/unix/utilsx11.h is not included by wx/wxprec.h so we need to include it
when using PCH too.

Closes #12517.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 12:48:07 +00:00
Vadim Zeitlin
ba81782ac3 Document wxSpinDoubleEvent class.
Add documentation for the class itself and the associated EVT_SPINCTRLDOUBLE
macro.

Patch by Carsten Fuchs.

Closes #12520.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 11:57:03 +00:00
Vadim Zeitlin
ffc71ce59d Close a modal dialog even when it doesn't have any buttons.
The close button in the dialog title bar should work even if there are no
buttons in the dialog itself (unlike the Escape key which works as an
accelerator for a button), so close the dialog explicitly if the emulated
button click wasn't processed in wxDialogBase::OnCloseWindow().

Closes #12513.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 11:52:06 +00:00
Vadim Zeitlin
f1b08e84a1 Fix typo in wxStandardPathsBase::ResourceCat description and document it.
Document the enum itself and also correct GetLocalizedResourcesDir()
documentation which didn't specify the default value for the category
parameter.

Closes #12523.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 11:51:50 +00:00
Vadim Zeitlin
b93f4239bb Compilation fix for MinGW STL build.
std::tr1::unordeded_map<T *>::find() doesn't accept "const T *" pointer, at
least with MinGW 4.4.0 standard library version, so add an explicit
const_cast<> to fix compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-26 22:11:32 +00:00
Vadim Zeitlin
4d5d3cb924 Compilation fix for MinGW 4.x in new keyboard code.
Explicitly choose the comparison operator to use when comparing wchar_t and
int values, otherwise MinGW (correctly) complains about ambiguity between
(int, int) and (wchar_t, const wxUniChar&) overloads.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-26 22:11:27 +00:00
Vadim Zeitlin
5ed8879eaf Make wxDateTime::Tm::yday public and document it.
There doesn't seem any reason to allow access to all the other struct Tm
fields but not yday so make it public, fill it in correctly when creating Tm
without using its ctor from struct tm and document struct Tm itself including
its yday field.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-26 22:11:21 +00:00
Vadim Zeitlin
fdb44eb24f Initialize wxDateTime::Tm::yday in the ctor.
Set Tm::yday to a fixed value in the ctor as well instead of not initializing
it at all.

This bug actually didn't have any visible consequences as yday is currently a
private member of struct tm and didn't seem to be used anywhere but it at
least avoids MinGW 4.x warnings about possibly uninitialized variable and
might become important in the future if we allow accessing this field.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-26 22:11:16 +00:00
Vadim Zeitlin
784a3130f8 Correct g++ 4.x warnings about suggested explicit braces.
Several warnings were generated for wxLogLastError() calls inside
CALL_CARET_API macro by MinGW 4.4. Fix them by adding the extra braces.

See also r61475.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-26 22:11:10 +00:00
Jaakko Salli
36b7e3a2ec Correct empty space drawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-24 17:44:20 +00:00
Jaakko Salli
fb296a697d Removed debug log message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-24 17:40:06 +00:00
Jaakko Salli
248a4ec0f2 Fixed PCH-less build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-24 15:22:52 +00:00
Jaakko Salli
2e2e62def1 Have wxPropertyGrid inherit from wxControl and wxScrollHelper instead of wxScrolledWindow. This is the approach other scrolled controls use.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-24 14:47:20 +00:00
Robin Dunn
ff94c563ed Fix sending a size event for the displayed page when the notebook is sized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 21:12:40 +00:00
Robin Dunn
53ba4eb40a Use the wx version of the wxDECLARE_EVENT_TABLE_ENTRY macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 21:11:47 +00:00
Robin Dunn
a2d0722f48 Avoid an endless recursion situation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 21:10:34 +00:00
Robin Dunn
a12482a357 Allow the renderer to also work with wxMemoryDCs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 21:09:24 +00:00
Robin Dunn
e6933ff911 SetUserScale(1.0, 1.0) in Unmask() so the image will not be scaled again when blitted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 21:08:26 +00:00
Robin Dunn
6f5778a627 CanSetTransparent needs to be virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 21:07:19 +00:00
Robin Dunn
e5ad1e9d4b Various build tweaks and updates for wxPython 2.9.1.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 21:05:30 +00:00
Robin Dunn
80367c29a9 Add flag to enable specifying an architecture to build on Mac. Also add x86_64 architecture to universal build when buildng wxOSX-Cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 20:54:54 +00:00
Steve Lamerton
da7ae3570a Remove an assert that was not backed up by the documentation and so failed on some platforms but not on others. Re-enable some tests that were disabled in wxGTK as they now pass.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 17:02:08 +00:00
Steve Lamerton
4ceca85497 Add ClearEventCount to wxTestableFrame. This means we can clear an event count when an event counter goes out of scope so the are no spurious results in later tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 16:55:29 +00:00
Julian Smart
d13a8e05c2 Fix bug finding line after line break
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 16:24:04 +00:00
Jaakko Salli
c27615f55c Streamline wxPropertyGrid tooltip code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 12:58:02 +00:00
Jaakko Salli
614a87dffe When setting empty string as a tooltip, call gtk_widget_set_has_tooltip() with FALSE to remove the tooltip. This will bring wxGTK behavior in line with wxMSW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 12:55:22 +00:00
Steve Lamerton
9e48865ca1 Fix assert when changing the filter selection on a multiple selection wxGenericDirCtrl.
Because ExpandPaths selects the item we can simply grab a list of selected paths and then expand them all in the multiple selection case. The single selection case is unchanged.

Closes #12340

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-22 19:24:41 +00:00
Vadim Zeitlin
033428a32c Better checks for wxMSWKeyboard::VKToWX() return value.
Don't generate key events without any valid key code (this shouldn't normally
happen but might on exotic keyboards with keys that we don't know about).

Also ensure that we can distinguish between VKToWX() returning dead keys and
non-Latin-1 keys by setting wchar_t output parameter to WXK_NONE too in the
former case but not the latter.

Generate wxEVT_CHAR_HOOK events for non-Latin-1 keys too in Unicode build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-22 13:31:41 +00:00
Vadim Zeitlin
246117d444 Fix recently broken generation of wxEVT_CHAR_HOOK events in wxMSW.
Changes to VKToWX() semantics broke the logic of the global keyboard hook
function in wxMSW which didn't generate wxEVT_CHAR_HOOK events for ASCII
special keys such as WXK_ESCAPE any more.

Fix this and also generate wxEVT_CHAR_HOOK for all events, not just the
non-ASCII keys for consistency with the documentation and wxGTK.

Closes #12501.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-22 13:31:32 +00:00
Steve Lamerton
a323f63a8d Re-enable disabled wxWindow label tests under wxGTK as they were fixed in r65374
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-22 12:45:45 +00:00
Steve Lamerton
2a4a928df7 Send generic wxTreeCtrl wxEVT_COMMAND_TREE_KEY_DOWN events from OnKeyDown rather than OnChar. This change means it sends events for the same keys as the wxMSW control. It also fixes the failing unit test.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-22 10:06:39 +00:00
Steve Lamerton
92d9d10f80 Send generic wxListCtrl wxEVT_COMMAND_LIST_KEY_DOWN events from OnKeyDown rather than OnChar. Also remove the HasCurrent check. These changes bring the generic control into line with the control under wxMSW. Re-enable the previously failing unit test and document that the key down event might not have a valid item associated with it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-22 08:48:15 +00:00
Vadim Zeitlin
2f0312f0c4 Compilation fixes for old SDKs (VC6) after recent commit.
Define WM_QUERYUISTATE in wx/msw/missing.h too as src/msw/statbox.cpp uses it
now.

Also move DT_HIDEPREFIX definition from wx/msw/private/button.h to missing.h
as well as it's now used in statbox.cpp too. Include missing.h explicitly from
the files that use DT_HIDEPREFIX.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-21 12:57:59 +00:00
Vadim Zeitlin
74d3098357 Compilation fix of wxSocket code for older Solaris versions.
Include sys/filio.h to define FIONBIO in all cases (sometimes this header is
already included from sys/ioctl.h but not always).

Closes #12481.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-21 11:56:53 +00:00
Vadim Zeitlin
b4607e897c Correct drawing of mnemonics in wxStaticBox label under wxMSW.
Only show the mnemonics if they need to be shown, i.e. use the same logic as
the standard controls use, to avoid showing mnemonics in wxStaticBox with
custom label colour even when other wxStaticBoxes don't show it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-21 11:44:47 +00:00
Vadim Zeitlin
2af006ebd3 Fix wxStaticBox label redrawing when "Alt" is pressed in wxMSW.
The default handling for Alt key press in the standard control is to redraw
the label to account for showing of the keyboard queues (i.e. if the mnemonics
were initially hidden, they are shown when Alt is pressed) but it doesn't
redraw it in the correct colour resulting in any custom label colour being
lost whenever Alt is pressed anywhere in the window containing the box.

Fix this by forcing the box refresh which will result in repainting it using
our code which does use the correct colour.

Also update the static page of the widgets sample to allow changing the
colours of all static controls on this page, including the wxStaticBox, and
not just the main wxStaticText.

Closes #12497.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-21 11:44:41 +00:00
Jaakko Salli
b89b24691e Call SetToolTip() for the property editor control when wxPG_EX_HELP_AS_TOOLTIPS style is used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 15:38:12 +00:00
Vadim Zeitlin
63dcc736df PCH-less compilation fix to GDI+ wxMSW code.
Closes #12496.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 14:14:12 +00:00
Vadim Zeitlin
af6da66ce3 Correctly recognize when wglChoosePixelFormatARB() fails.
This function returns TRUE even if it failed to find any matching formats, so
test not only its return value but also the number of formats it found.

Closes #12474.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 13:15:21 +00:00
Vadim Zeitlin
76c4b1491e Always use native task dialog for wxProgressDialog under MSW if supported.
Use task dialogs even for the dialogs with wxPD_AUTO_HIDE style flag and
without wxPD_CAN_ABORT one. Generic fallback was used in this case as native
task dialog doesn't support dialogs without buttons but it is finally better
to create a dummy button and use the native dialog nevertheless. We already
have a mostly disabled "Close" button for the dialogs without wxPD_AUTO_HIDE
style so it seems logical to also have it (but just never enable it at all)
when this style is used.

Closes #12462.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 13:11:03 +00:00
Vadim Zeitlin
edc0f733a7 Ignore time component of SYSTEMTIME in wxMSW wxDatePickerCtrl.
This is similar to the fix of r64208 for wxCalendarCtrl and ignores the time
component of SYSTEMTIME objects returned by the native functions in
wxDatePickerCtrl too to ensure that we operate with pure dates only.

Closes #12493.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 13:10:49 +00:00
Vadim Zeitlin
5858fe6806 Don't use native MSW functions in wxString::CmpNoCase().
While the native CompareString() is much more efficient than MSVC CRT version
of _wcsicmp(), it gives unexpected results for non-letter characters, so don't
use it but use the slow but correct wxStricmp() instead.

At least don't use char-by-char comparison (in non-UTF-8 case) as it's the
slowest possible implementation of this function, the new one using
wxStricmp() is 3 times faster (by comparison, using CompareString() is 16
times faster still -- but wrong).

Closes #10375.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 12:52:26 +00:00
Vadim Zeitlin
05f68f2f84 Add benchmarks for various ways to compare strings.
Benchmark the abstraction overhead of wxString methods compared to plain
functions and also benchmark native functions for string comparison under MSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 12:52:21 +00:00
Vadim Zeitlin
ad1ca29690 Flush output after every benchmark.
This purely cosmetic change simply allows to see the output of the benchmarks
sooner which is more user-friendly when running several long benchmarks.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 12:52:15 +00:00
Steve Lamerton
89416032c2 Increase the number of expected events in TreeCtrlTestCase::KeyDown and ListBaseTestCase::KeyDown from four to six as this is the number of events seen when testing using their samples. This also stops the tests failing after the recent keyboard event improvements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-19 10:02:57 +00:00
Vadim Zeitlin
179c657bc7 Really fix setting fonts in RichEdit 4.1 controls.
The fix applied in r64394 wasn't enough and the control could still decide to
overwrite the font used by default when non-ASCII characters were inserted
into it. To really force it to use the font we want we apparently must send it
EM_SETCHARFORMAT with SCF_ALL flag (MSDN also documents SCF_DEFAULT but it's
not clear if we should use it instead or together with SCF_ALL, for now it
doesn't seem to be necessary).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-18 16:26:35 +00:00
Vadim Zeitlin
a8abba41bc No changes, just refactor wxTextCtrl::SetStyle() in wxMSW.
Split this overly long function into MSWSetCharFormat() and MSWSetParaFormat().

No real changes otherwise except for the use of PARAFORMAT instead of
PARAFORMAT2 if wxUSE_RICHEDIT2 is not set as it was certainly intended (but
the fact that nobody complained about this problem means that nobody must be
compiling without wxUSE_RICHEDIT2 by now so arguably we should just remove it
completely).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-18 16:26:30 +00:00
Vadim Zeitlin
4f7c00f237 Set wxTextCtrl::m_verRichEdit to 4 for RichEdit 4.1.
Set m_verRichEdit to a different value for the version 4.1 of the control as
it behaves subtly differently from the previous versions.

Also clarify that value of 2 is used for both 2.0 and 3.0 versions of the
control.

No real changes yet.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-18 16:26:22 +00:00
Robert Roebling
3f53dd3a2f Postpone EnsureVisible() to idle as this sometimes seems to be required, fixes #12480: wxDataViewCtrl::EnsureVisible does not make item visible in some
circumstances on GTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-17 19:07:02 +00:00
Dimitri Schoolwerth
b5b208a179 Set svn properties on .cpp files.
Add missing svn:eol-style property to all .cpp files. Also set svn:keywords for .cpp files which don't have that property yet to Id, including src/osx/core/glgrab.cpp for consistency (it doesn't make use of the property).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-17 11:17:55 +00:00
Vadim Zeitlin
4f1b95ea52 Allow setting Mac-specific menu item ids to wxID_NONE to suppress them.
If s_macAboutMenuItemId or s_macPreferencesMenuItemId was explicitly set to
wxID_NONE by the application, don't add them to the standard menu at all,
otherwise they would be present there but be always disabled and useless.

This is still not documented because we really need a better API for this but
it at least provides a temporary workaround for having useless menu items
under OS X.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-16 19:36:37 +00:00
Vadim Zeitlin
0dc44daa33 Allow use of report mode non-native wxListCtrl in wxListBook under Mac.
The use of wxListBook in report mode was disabled for wxOSX in r54001 and
r54318 (see #9484) because it created problems with the native wxListCtrl
implementation but the report mode can be used if we're using the generic
wxListCtrl version so do allow to use it if the system option governing the
choice of the version to use is set to "generic".

Of course, the real fix would be to correct the bugs in the native wxListCtrl
version and use report mode always but for now this at least restores correct
behaviour with the generic version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-16 19:36:29 +00:00
Vadim Zeitlin
75595b9750 Only use wxFORCE_LINK_MODULE() in mediaplayer sample in static build.
The linking optimization this macro protects against can't happen when using
DLL and so using it is at best useless and actually harmful (because it
doesn't contain the correct DLL export declarations) in the latter case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-16 11:05:51 +00:00
Vadim Zeitlin
473ca5f34a Compilation fixes for non-MSVC 9 compilers after r65555.
Somehow MSVC 9 compiled invalid wxT(__FUNCTION__) expressions but both MinGW
and MSVC 6 (correctly) failed. Don't use this construct at all but instead
call wxLogLastError() with the real function name.

Also refactor the code slightly to avoid having to repeat this fix thrice.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-16 11:05:46 +00:00
Václav Slavík
685ed4d1f8 Fix wxMSW rendering artifacts with modal dialogs.
When a modal dialog showed another modal dialog, parts of the parent
window weren't refreshed correctly. This demonstrated itself as
rendering artifacts when moving the child dialog to another position:
parts of the dialog were shown as disabled, parts as enabled.

Fixed by explicitly refreshing the window.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-16 09:05:48 +00:00
Vadim Zeitlin
d5947fad64 Remove display information caching from MSW wxDisplay implementation.
Don't cache display rectangle and client rectangle as they can both change
during the program lifetime (especially the latter which changes whenever
taskbar is moved or shown/hidden) and retrieving them every time they're
needed doesn't seem to be a problem performance-wise anyhow.

We still cache the list of all the monitors, ideally we'd refresh it when we
receive a notification about a display being [dis]connected.

Closes #4582.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 23:04:02 +00:00
Dimitri Schoolwerth
09a8cab77b Fix possible errors introduced while generating Xcode project.
Under some unknown circumstances two added source files are concatenated into one faulty entry in an Xcode project (this probably occurs either at the Xcode or XMLTools2 level). Try to detect these errors in the Python script and fix them by patching up the project.pbxproj file.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 22:13:40 +00:00
Vadim Zeitlin
7d4cb1eff5 Document limitations of the generic wxTextEntry hints.
Calling methods other than SetValue() or ChangeValue() doesn't update the
display correctly currently, see #12475.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 22:10:26 +00:00
Vadim Zeitlin
7bfc104bba Update the text hint display correctly when ChangeValue() is called.
wxTextEntry::ChangeValue() doesn't generate any events so we need to
explicitly update the text stored by wxTextEntryHintData when it is called to
ensure that it corresponds to the real controls value.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 22:10:20 +00:00
Vadim Zeitlin
a7aeddacf9 Fix several bugs in generic text entry hints implementation.
The text controls contents and colour was not updated correctly in several
situations (see #12475).

The old code was completely wrong as it didn't store the actual value of the
control at all and so could never work. Do store and update it now and show
the hint if and only if the real contents is empty.

Also handle "text updated" event to correctly update the hint when the control
becomes [non-]empty.

Closes #12475.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 22:10:14 +00:00
Vadim Zeitlin
6eb6062821 Fix wxTextEntry::SelectAll() in presence of hints in wxGTK.
Translation of wx (-1, -1) selection to (0, GetValue().length()) in
wxTextCtrl::SetSelection() was unnecessary as it ended up calling the base
class wxTextEntry::SetSelection() version which didn't need it. Moreover, this
translation was actually harmful when the text control happened to show a hint
string as its official value was empty in this case and so SetSelection(0, 0)
was called which didn't do anything and broke clearing/changing the controls
text when it was showing a hint.

Simply don't translate the indices when using a single line control to fix
this.

See #12475.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 22:10:07 +00:00
Dimitri Schoolwerth
a99dbd9eba Use a unique namespace for generating identifiers.
Instead of using uuid.NAMESPACE_DNS as namespace use a newly generated UUID. Also minor cleanup of import uuid statement.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 11:45:32 +00:00
Dimitri Schoolwerth
7f71d431ee Make Xcode identifier consecutive when there is a collision.
Making them consecutive groups source files that are repeated next to each other in the project file like Xcode does, instead of creating a complete new random identifier which resulted in creating a distance between the source files after they were sorted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 11:29:07 +00:00
Václav Slavík
dc2b49b3d1 Click on wxOwnerDrawnComboBox's animating popup should close it.
Previously, it behaved differently from native combo box: clicking the
popup while its opening animation was running had no effect. This was
different from the native control, which would close the popup in this
case (just like when it's fully opened).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-14 18:35:50 +00:00
Peter Cawley
6f7e96d843 Fix incorrect behaviour of wxRibbonGallery::EnsureVisible when the ribbon is vertical rather than horizontal.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-14 17:35:26 +00:00
Vadim Zeitlin
ed84dc74d9 Fix drawing of items with custom background in wxGenericListCtrl.
This was broken by the changes of r64879 which erroneously used
wxRendererNative::DrawItemSelectionRect() even for the non-selected items.

Now only use DrawItemSelectionRect() for the selected items to make them
appear natively while drawing the non-selected items with custom background
colour ourselves.

Also refactor the code to avoid (the not quite and hence especially
pernicious) duplication between wxListLineData::Draw() and DrawInReportMode():
rename SetAttributes() to ApplyAttributes() and draw the item background in
this function now instead of doing it in both Draw() and DrawInReportMode().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-14 13:18:48 +00:00
Vadim Zeitlin
4be95bef8c Fix hang on termination of wxProgressDialog with wxPD_AUTO_HIDE style.
We don't need to run a modal event loop waiting for the wxProgressDialog to be
closed when it has wxPD_AUTO_HIDE style because it does it on its own.

Closes #12472.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-14 10:24:35 +00:00
Robert Roebling
b955766e88 Document wxDataViewListModel as common abstract base class for
wxDataViewIndexListModel and wxDataViewVirtualListModel.

Add wxDataViewListModel::GetCount() as both have it.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-13 20:12:57 +00:00
Robert Roebling
d8090b5e2c Further work on wxDataViewListModel::Reset()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-13 20:02:01 +00:00
Vadim Zeitlin
b95d405138 Update wxRibbonPanel documentation to mention use of sizers.
This documents the changes of r65436.

Closes #12418.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-12 22:58:58 +00:00
Vadim Zeitlin
c67f815120 Delete wxListCtrl item data after handling its deletion event in wxMSW.
We deleted the data associated with the item too soon as we did it before the
handler for the item deletion event was run and this handler could still
access this data.

Only free the data after the handler returns now.

Closes #12449.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-12 22:58:53 +00:00
Vadim Zeitlin
ba97f6f8a3 Fix compilation of EnumerateLoadedModules() call for MinGW64 4.5.
Our logic for detection of whether the first argument of
PENUMLOADED_MODULES_CALLBACK is const or not didn't work for MinGW64 4.5.

Replace it with a less error-prone (even if more ugly) version which simply
casts the callback to the type expected by the function.

Closes #12465.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-12 22:58:48 +00:00
Vadim Zeitlin
7095bd60e2 Define MAPVK_VK_TO_CHAR to fix wxMSW compilation with old SDK headers.
At least MinGW headers don't define this constant.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-12 22:05:51 +00:00
Robert Roebling
673810eeb8 Moved more code from wxDataViewCtrl to wxDataViewCtrlInternal.
Add new special API for wxDataViewVirtualIndexModel::Reset() as
wxDataViewModel::Clear is something different and needs a different, two
step API under GTK+, one for destroying the current view and one for
rereading the new contents.
Added ::BeforeReset() and ::AfterReset() notifications for that purpose.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-12 20:07:28 +00:00
Julian Smart
5249673498 Fix for % symbols going missing from style parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-12 16:16:48 +00:00
Vadim Zeitlin
03bec791dd Compilation fix for wxOSX.
Remove stray closing brace.

Also fix a warning about unused parameter.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 11:20:40 +00:00
Vadim Zeitlin
d0fb62a656 Generate the same flags for modifier key events in wxGTK as in wxMSW.
Resolve the discrepancy between modifier flags of the key events corresponding
to the modifier key itself between wxMSW and wxGTK by changing the latter to
follow wxMSW behaviour.

Clearly document the now officially correct behaviour of the modifiers for the
key events corresponding to the modifiers keys themselves in the manual.

This fix also makes it unnecessary to work around this bug in the keyboard
unit test so remove it from there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:19:14 +00:00
Vadim Zeitlin
7333c0ef82 Generate unshifted Unicode key codes in wxEVT_KEY_XXX events in wxGTK.
wxGTK generated wxEVT_KEY_XXX with key codes corresponding to the unshifted
state of the key (except for the letters) but Unicode key codes corresponding
to the current shift state. This was inconsistent with wxMSW and also with the
idea that key events, unlike char ones, don't depend on the modifiers states.

Change wxGTK to behave as wxMSW and use unshifted values for Unicode key codes
as well.

Remove the now unnecessary workaround for different key event Unicode codes
from test.

Also try to explain the difference between normal and Unicode keys and key and
char events even better and mention that the Unicode key codes for the key
events are also untranslated in the documentation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:19:07 +00:00
Vadim Zeitlin
5844ad30dd Fix generation of key events for non-alphabetic keys under Windows.
Don't hardcode the values of VK_OEM_XXX keys which are completely nonsensical
on keyboards with non-US layouts. Use the real unshifted value of the key as
its key code instead -- at least if it's a Latin-1 character. Otherwise, use
WXK_NONE as the key code and pass the character generated by the key as
Unicode character code.

Also generate WXK_NONE events for dead keys to avoid confusing them with the
corresponding normal key events.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:19:02 +00:00
Vadim Zeitlin
e7b12eece0 Improve printing out of pressed keys in the keyboard sample.
Add missing elements of wxKeyCode enum ("Windows" and "Command" keys) to the
GetVirtualKeyCodeName() function in the sample.

Also output "unknown" and not blank for WXK_NONE.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:57 +00:00
Vadim Zeitlin
0c03f52d02 Rename wxCharCode{MSWToWX,WXToMSW}() and move them to a separate header.
These functions were confusingly named as they work with MSW (virtual) key
codes and not character codes, rename them to better indicate what they do.
They also don't need to be in wx/msw/window.h included by all wx code when
they are only really needed in a couple of files, so move them to a private
header.

No changes in behaviour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:53 +00:00
Vadim Zeitlin
b6885972ee Fixes to key codes in keyboard events generated by wxMSW.
Only set Unicode key code if the event corresponds to a character key and set
it to (newly added) WXK_NONE for the other ones to avoid nonsensical values in
it for e.g. "Home" key presses.

Also set non-Unicode key to WXK_NONE for the characters that can't be
represented in the current locale. This is consistent with wxGTK and avoids
conflicts between special key values and Unicode keys.

Clearly document the above behaviour.

Notice that implementing the correct behaviour in wxMSW involved untangling
previously interwoven WM_KEY{DOWN,UP} and WM_CHAR messages handlers. Clearly
separate them now as they get different input (key codes for the former,
characters for the latter) and especially don't try to convert from both kinds
of input using a single wxCharCodeMSWToWX() function. As this function doesn't
need to distinguish between keys and characters any more it can simply return
the converted value in all cases instead of returning 0 sometimes to indicate
a character value instead of a key. Simplify the code using this function
accordingly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:47 +00:00
Vadim Zeitlin
86408a0374 Add WXK_NONE symbolic constant indicating absence of a key.
wxKeyEvent::GetKeyCode() and GetUnicodeKey() return 0 to indicate that the key
code or Unicode character is not available, give symbolic name to this 0 to
make the code using these methods more clear.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:41 +00:00
Vadim Zeitlin
e6cef55ae1 No real changes, just use KF_EXTENDED instead of hard-coded bit mask.
KF_EXTENDED is defined in Windows headers as the mask for extracting the
"extended" bit from LPARAM of the keyboard messages. Use it instead of
explicitly writing less clear "1 << 24".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:35 +00:00
Vadim Zeitlin
042ddf5def Add a simple test for keyboard events generation.
Check that the events generated by wxUIActionSimulator result in the same
wxKeyEvents being generated under all platforms. This is not the same as
checking the event generation for the actual keys pressed by the user as there
are some small differences between the two but better than nothing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:31 +00:00
Vadim Zeitlin
2dcbc4615b Generate correct events for extended keys in wxMSW wxUIActionSimulator.
Simulating keys such as WXK_END resulted in WXK_NUMPAD_END event being
generated instead of the expected WXK_END one.

Fix this by returning from wxCharCodeWXToMSW() whether the key code is a
normal or extended one and use this to set KEYEVENTF_EXTENDEDKEY in
wxUIActionSimulator::DoKey().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:25 +00:00
Vadim Zeitlin
9cbe96d093 Remember the last key event in wxGTK before passing it over to IM.
Save the last key event before calling IM filter to be able to get the correct
modifiers, timestamp, position &c to use for the CHAR event generated from IM
commit callback.

This restores the changes of r34504 which were reverted for unknown (or at
least unmentioned) reason in r34521.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:19 +00:00
Vadim Zeitlin
371412145f Explicitly send events for modifier keys in wxUIActionSimulator.
Key down/up events for the modifiers were already explicitly sent under wxMSW
and wxOSX but not under wxGTK where, as the result, the corresponding events
were not generated at all.

Do send these events explicitly to make the events generation consistent under
all platforms now. This means that wxUIActionSimulator::DoKey() now generates
exactly one event everywhere.

Notice that the modifiers for the key events generated by the modifier keys
are also the same under all platforms now which is not the case for the events
actually generated by the user (wxMSW sets the corresponding bit for the
modifier key down event but not the key up one while wxGTK does exactly the
contrary). This should be fixed in the future so that wxUIActionSimulator
generates the same sequence of events as the user would and that it's still
the same for all platforms.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:15 +00:00
Vadim Zeitlin
c3f62b348f Remove assert checking for wxMOD_CONTROL from wxUIActionSimulator.
It doesn't make sense to fail if modifiers parameter includes wxMOD_CONTROL
telling the caller to use wxMOD_CMD instead as the latter is exactly the same
as the former under non-Mac platforms.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:10 +00:00
Vadim Zeitlin
8cdd00f29f Add a convenient wxREGISTER_UNIT_TEST() macro.
This macro can be used to easily register a test following a standard naming
convention in both the global test suite and the test suite with the same name
as this test instead of having to use 2 different cppunit macros to do the
same thing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:18:05 +00:00
Vadim Zeitlin
daf9622e38 No real changes, just some small cleanup in wxMSW keyboard code.
No changes, just use more clear variable name ("keycode" instead of "id") and
anonymous namespace instead of static keyword.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 10:17:57 +00:00
Stefan Csomor
5d57348ef5 fixing 'main screen'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-11 09:20:28 +00:00
Vadim Zeitlin
4d4c704c3e Use wxLocale::GetInfo() to get date format in wxDatePickerCtrlGeneric.
Instead of trying (and failing) to manually decode the format used by "%x",
simply use wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT) and just change "%y" to
"%Y" if necessary.

The new code is more than 10 times shorter and also gives correct results
unlike the old version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 19:42:23 +00:00
Vadim Zeitlin
5dea30b309 Don't add spurious NULs at the end of wxTextDataObject text under OS X.
For some reason we added an extra NUL character to the data copied from
wxTextDataObject but this doesn't seem necessary because the Pasteboard API
is passed the correct data size and so the string doesn't need to be
NUL-terminated.

In fact, adding this NUL broke drag and drop between wx and native controls,
including the case of dropping text in our own wxTextCtrl as this uses its
built in support for dnd and not our code (the fact that we can't even set a
drop target for a wxTextCtrl is a separate bug). In this case we got a string
with an extra NUL in the control resulting in all sorts of hard to debug
problems.

So simply don't add the extra bytes, dnd works fine without them both between
wx windows and from/to another OS X applications.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 19:28:52 +00:00
Vadim Zeitlin
3e4f133a43 Initialize wxGenericProgressDialog button members in Init() too.
wxGenericProgressDialog::m_btn{Abort,Skip} were not initialized neither which
resulted in crashes inside EnableAbort() which was called if the "Cancel"
button was pressed in a native MSW dialog but the dialog wasn't cancelled (and
hence the button needed to be reenabled).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 17:26:11 +00:00
Vadim Zeitlin
21a5e7e0a7 Fix closing logic in wxMSW native wxProgressDialog.
The dialog must always close if the C++ object was destroyed, independently of
whether it was cancelled or finished.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 17:26:07 +00:00
Vadim Zeitlin
cc31a982ec Block in wxMSW wxProgressDialog::Update(max) until the dialog is dismissed.
For consistency with the generic version and because it makes more sense than
blocking in the dialog destructor (which is the only other alternative for the
dialogs without wxPD_AUTO_HIDE to work), we should block in Update() when the
maximal value is reached for dialogs without wxPD_AUTO_HIDE style until the
dialog is dismissed.

Document this behaviour even more clearly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 17:26:03 +00:00
Vadim Zeitlin
2de77c6a54 Fix errors in handling of maximum field in wxGenericProgressDialog.
Provide a SetMaximum() function for setting just m_maximum and return its
value from GetRange() instead of using m_gauge->GetRange() which doesn't work
when the native MSW version is used nor when the range is > USHRT_MAX under
MSW in any case.

More generally, this should fix a lot of bugs for progress dialogs using such
range as the values were not interpreted correctly in many places.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 17:25:58 +00:00
Vadim Zeitlin
4f4d6f44f9 Rename wxGenericProgressDialog::ProgressDialogState to just State.
Repeating "ProgressDialog" twice is redundant.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 17:25:53 +00:00
Vadim Zeitlin
979901c8df No changes, just use less long progress dialog states names.
We can refer to them using wxProgressDialog class name and not the base
wxGenericProgressDialog so do this as it is shorter and more clear because
these states have nothing to do with the generic version when used by the
native MSW implementation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 17:25:45 +00:00
Vadim Zeitlin
928da15b8e Use determinate mode in native wxMSW wxProgressDialog by default.
The dialog was created in indeterminate ("marquee") mode for some reason.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 17:25:41 +00:00
Vadim Zeitlin
f434800ca3 Add a possibility to show a progress dialog on dialog sample startup.
Add a command line option to the dialogs sample to allow testing of different
wxProgressDialog styles more easily. This also tests for showing them before
the main event loop is started (see r65499).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 17:25:35 +00:00
Vadim Zeitlin
e77570de2e Don't use wxGenericProgressDialog::m_windowStyle for wxPD_XXX styles.
Storing progress dialog styles in the normal window style didn't work because
they clashed with the TLW styles. The original progress dialog implementation
worked around this by using separate m_has{Abort,Skip}Button variables instead
of relying on wxPD_CAN_{ABORT,SKIP} style bits but this didn't work for the
other styles and was unclear so the new native MSW implementation blithely
used m_windowStyle to test or them and other bits which didn't work at all,
see #12416.

Solve this by using a separate m_pdStyle variable for storing the progress
dialog styles and use it for all wxPD_XXX tests in both the generic and MSW
code. This fixes some bugs (although not all of them yet) and allows to get
rid of m_has{Abort,Skip}Button.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 17:25:28 +00:00
Stefan Csomor
827833e2e2 adjusting to new gui mutex for osx, see #12411
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 13:41:50 +00:00
Vadim Zeitlin
7ad8a38ae5 Create temporary wxEventLoop in wxGenericProgressDialog if needed.
wxGenericProgressDialog needs to have an active event loop in order to repaint
itself and process clicks on its buttons but it's more helpful to create a
temporary event loop if there is no currently active one instead of just
asserting. In particular, this allows to use wxProgressDialog from overridden
wxApp::OnInit().

Add temporary event loop creation and remove the now unnecessary asserts
verifying that there is an active event loop as there always will be one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 11:44:46 +00:00
Vadim Zeitlin
79e58a409e Initialize wxGenericProgressDialog::m_winDisabler properly.
This field wasn't initialized by Init() which might have been harmless
considering the current code structure but still untidy, do set it to NULL
there.

Also move the forward declaration of wxWindowDisabler class in
wx/generic/progdlgg.h to the top of the file for consistency with the other
forward declarations.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 11:44:40 +00:00
Vadim Zeitlin
395da337e9 Don't return false from IsOk() for accelerators without flags.
wxAcceleratorEntry::IsOk() checked for m_flags != 0 for some reason. Simply
remove this test.

See #12444.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-10 11:44:35 +00:00
Vadim Zeitlin
da209561e3 Fix infinite loop in wxDateTime::Format() when fields width was used.
Just add a missing increment of the loop variable.

See #12451.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 22:20:12 +00:00
Vadim Zeitlin
ca9fc039c1 Fix cast of pointer to int in artprov sample.
This prevented the sample from building when using MinGW-64 and also probably
prevented it from working correctly on other 64-bit systems.

Closes #12453.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 22:20:07 +00:00
Vadim Zeitlin
ba75967c9c Initialize all fields of struct tm used by wxDateTime::Format().
Passing not fully initialized struct tm to strftime() results in Valgrind
errors and possible nastiness, see #12455.

Simply use memset() to set all fields of this system-dependent struct to 0
initially.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 21:57:52 +00:00
Vadim Zeitlin
e436c454e1 Fix wxKill(wxSIGNONE) always returning true for child processes in wxMSW.
The fact that a handle to a process can be opened doesn't mean that the
process is still running. In fact, for a child process that we store a handle
for ourselves we will always be able to open (another copy of the) handle even
if it already terminated.

Check for the process termination using WaitForSingleObject() instead in both
normal and wxSIGNONE cases.

Also simplify the code by not using GetExitCodeProcess() at all as we don't
need the process exit code.

Closes #2834.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 21:49:44 +00:00
Vadim Zeitlin
b54ceb72ce Remember last values used in exec sample "Kill" menu item dialogs.
Remember the PID entered in the dialog and also remember the last used signal
number. This makes these dialogs slightly less painful to use when testing
even though ideally we'd have a single dialog for choosing both values instead
of two consecutive modal dialogs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 21:49:25 +00:00
Vadim Zeitlin
732c0c4874 Very minor fixes to wxKill() documentation.
Fix "the the" typo.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 21:49:07 +00:00
Vadim Zeitlin
e19dbcf76b Use minimal required process access mask in wxMSW wxKill().
We don't need PROCESS_TERMINATE permission if we are not going to call
TerminateProcess() for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 21:48:48 +00:00
Vadim Zeitlin
38fd5bad72 Don't filter out Cairo libraries from GTK libraries list in configure.
This undoes the hack of r35357 which surreptitiously removed all Cairo
libraries from the GTK libraries list. This shouldn't be necessary any more as
we use Cairo calls in our own code and so can't run without it anyhow and in
fact is even actively harmful as it results in linking errors under Fedora 13
(which seems to use a slightly different linker?).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 20:59:10 +00:00
Vadim Zeitlin
83a7613b71 Use the same logic for closing dialogs as for handling Escape key.
Pressing "Esc" key closed the dialog with only wxID_OK button (but no
wxID_CANCEL one) by default but pressing the "close window" button only closed
it if wxID_CANCEL was present.

Fix this by using the same code in OnCloseWindow() as in OnCharHook(), after
extracting it into the new SendCloseButtonClickEvent() method.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 20:53:26 +00:00
Vadim Zeitlin
0b94182cdc Remove the unused "monolithic" MSW wxMediaCtrl file.
The contents of this file was split over src/msw/mediactrl_{am,qt,wmp10}.cpp a
long time ago and this file is unused and not compiled into the library so
having it in the repository is useless and confusing -- remove it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 20:34:00 +00:00
Vadim Zeitlin
6161dd2d48 No real changes, just don't use obsolete FORCE_LINK_ME in wxMediaCtrl.
Use wxFORCE_LINK_THIS_MODULE() instead of the obsolete FORCE_LINK_ME.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 20:33:56 +00:00
Vadim Zeitlin
9b10161eb6 Force linking of all wxMSW wxMediaCtrl backends in mediactrl sample.
Force the linker to include all the backends in the sample executable instead
of discarding them because they are not used directly to allow testing all of
them in the sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 20:33:51 +00:00
Vadim Zeitlin
6d9db33c47 No changes, just remove cruft from mediactrl sample.
Remove the test for wxUSE_GUI together with the comment questioning its
presence.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 20:33:47 +00:00
Vadim Zeitlin
beea183b40 Remove debugging wxLogMessage from wxMediaCtrl::Create().
This was added apparently by mistake in r45478 and resulted in showing the
backend being used by the control in a message box whenever it was created
ever since.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 20:33:41 +00:00
Vadim Zeitlin
b672b8f490 Don't exclude "contrib" from wxMSW setup.exe generation.
This was presumably needed to exclude the top level contrib directory but also
seems to apply to src/tiff/contrib and excluding this directory breaks
configuration of libtiff as it looks for src/tiff/contrib/Makefile.in.

As we don't even have top level contrib any more, simply don't exclude it any
longer.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 10:18:31 +00:00
Dimitri Schoolwerth
6cb0fee84d use svn:keywords instead of eol:keywords
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 08:57:07 +00:00
Robert Roebling
89b6b731b6 Unregister configure callback,part of #12447: wxGTK patch: Segfault on Drag&Drop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-08 20:00:44 +00:00
Dimitri Schoolwerth
59719014c5 Make Xcode identifiers in generated project files be the same after each run.
From the AppleScript that composes the Xcode projects call a Python script that bases the identifiers on an associated name instead of being random each run like Xcode does. After the Python script reopen the project again in Xcode to have the identifiers sorted (Xcode wants them to be), resulting in the project.pbxproj file being completely different inside but in the IDE the order of files still will be the same.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-08 17:11:15 +00:00
Vadim Zeitlin
5eda55f775 Use correct Unicode define for wxScintilla compilation.
Compilation of wxScintilla with Borland failed because -D_UNICODE was not
passed on command line resulting in mismatches between wxChar and Windows
TCHAR. It's a mystery why this didn't happen with the other compilers but
defining _UNICODE for them too can't hurt.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-07 21:37:22 +00:00
Stefan Csomor
77eb08cc36 resetting the wrapper flag later, otherwise the native destructors dealloc too much, fixes #12448
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-07 16:05:01 +00:00
Stefan Csomor
d623e8b18a modeling subclassing along msw, unsubclassing filedialog at end of ShowModal, fixes #12236
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-07 06:51:13 +00:00
Stefan Csomor
a94c4b8529 using non-sleep version for GUI mutex, solves #12411
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-06 13:50:12 +00:00
Steve Lamerton
d377e9fe75 Simplify ButtonTestCase::Bitmap. The old test was not correct as it tested all bitmaps to see if they were valid, however these do not get set by SetBitmap and so the tests only passed if the platform set valid defaults.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-05 13:31:13 +00:00
Steve Lamerton
6e269b25f0 Fix typo from previous commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-05 13:14:14 +00:00
Steve Lamerton
48d133393c Move the second wxListBox sort test back to the ownerdrawn section and re-enable it under wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-05 13:11:42 +00:00
Steve Lamerton
663a3ae1da Wrap BitmapToggleButtonTestCase in a preprocessor check so compilation shouldn't fail on platforms that don't support it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-05 12:47:46 +00:00
Vadim Zeitlin
8297e64b31 Remove unused wxProgressDialogTaskRunner::m_parent field.
This seems to be a left over from old version of the code and is not used any
longer.

See #12414.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-04 13:33:40 +00:00
Vadim Zeitlin
a5655d37db Fix crash in wxMSW wxProgressDialog without wxPD_APP_MODAL style.
Use the correct method to retrieve the parent window to disable and check that
this pointer is not NULL before dereferencing it.

Closes #12414.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-04 13:33:36 +00:00
Vadim Zeitlin
aebe0d3b6c Improve main and extended messages handling in new wxMSW wxMessageDialog.
Don't use the main message if there is no extended message: this looks bad as
the main message is emphasized to contrast with the extended one which doesn't
make sense visually if there is no extended message.

Also recognize the common use of wxMessageBox() with a multiline text composed
of the first string that plays the role of the main message with the rest
being the extended one and handle this appropriately automatically. This
results in a better appearance by default for a lot of message boxes,
including even the one in our own minimal sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-04 13:33:29 +00:00
Vadim Zeitlin
b8737371e2 Add a link to Microsoft guidelines from wxICON_QUESTION documentation.
Microsoft documentation provides explanations as to how the icons should be
used in the message dialogs which can be useful for people wondering which
icon style to use an when.

See #12417.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-04 09:36:25 +00:00
Vadim Zeitlin
78dfd1fdd6 Don't link with long obsolete ctl3d32 library when using MinGW.
ctl3d32 was used for Win16 development and is not used by wxMSW since many
years, don't link with it unnecessarily when using MinGW.

Also remove a FIXME comment about an issue which doesn't seem to need any
fixing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-03 22:48:44 +00:00
Václav Slavík
71dd05d58a Fix wxOwnerDrawnComboBox keyboard navigation with duplicate items.
If the combobox contained duplicate strings (i.e. multiple items with the
same string value, but differing indexes), then navigating to the second
and subsequent ones skipped to the first occurence instead. We need to
preserve the index.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-03 19:33:18 +00:00
Václav Slavík
0a9c5e3564 Fixed wxscintilla compilation for wxDFB.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-03 19:33:11 +00:00
Steve Lamerton
5bb302a7aa Fix compilation under MinGW, also add missing SVN properties.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-01 15:25:01 +00:00
Julian Smart
edae63b076 wxRichTextCtrl::ApplyStyle now applies a paragraph style at the cursor
without needing a selection, and setting the default style now avoids duplicating
character attributes in subsequently typed text when they exist in the paragraph style.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-01 14:48:54 +00:00
Václav Slavík
8138f406a2 Reduce flicker when removing wxNotebook page.
wxMSW implementation hides all pages except the selected one. But when
removing selected page from the control, this invariant is temporarily
broken and this results in visible flicker. Hiding the page as soon as
it gets removed fixes it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-01 13:28:43 +00:00
Vadim Zeitlin
65a14fe8ea Update wx_dll.dsw to include the ribbon library.
Add wx_ribbon project with dependency on core library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-01 09:48:24 +00:00
Vadim Zeitlin
b99450eecb Add wxGrid::RefreshAttr() method to force attribute refresh.
A cached attribute may continue to be used even though the attribute returned
by a custom wxGridCellAttrProvider has changed so add a method to force wxGrid
to update the attribute by forgetting the cached copy.

Closes #12406.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-30 22:18:52 +00:00
Vadim Zeitlin
bb612373c0 Don't center wxGenericMessageDialog elements.
Centering doesn't seem to be appropriate on neither of the major platforms and
makes wxGenericMessageDialog and wxGenericRichMessageDialog which uses it look
even less native than otherwise.

Simply don't do it neither for the text nor, especially, for the buttons where
wxStdDialogButtonSizer already exists to take care of their alignment.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-30 21:48:25 +00:00
Vadim Zeitlin
d20ba5f860 Allow using custom labels for wxGenericMessageDialog buttons.
Custom labels set for wxGenericMessageDialog buttons were simply ignored as it
used CreateSeparatedButtonSizer() to create the actual buttons which in turn
always used the standard labels.

Fix this by explicitly creating the buttons with custom labels if necessary.

This also fixes custom label support in wxGenericRichMessageDialog deriving
from this class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-30 21:48:21 +00:00
Vadim Zeitlin
b14cca2a84 Extract CreateSeparatedSizer() from wxDialog::CreateSeparatedButtonSizer().
Extract the code adding a separating wxStaticLine to the sizer in its own
function to be able to reuse it in upcoming commits.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-30 21:48:16 +00:00
Vadim Zeitlin
a01d6442f4 Fix button order in wxStdDialogButtonSizer in all cases under GTK.
The order of Yes/No/Cancel was recently fixed by the changes in r65346 but it
broke the order of the buttons in Ok/Cancel case. Ensure the correct order is
used in all cases now: the one described by GNOME HIG by default but different
order for the special case of Yes/No/Cancel which follows the native message
box.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-30 21:48:11 +00:00
Vadim Zeitlin
4c624eb1e5 Rewrite GTK section of wxStdDialogButtonSizer using wxSizerFlags.
Using wxSizerFlags makes the code shorter and more understandable but
otherwise there are no real changes in behaviour except for a minor fix to one
of the border which was wrong before.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-30 21:48:06 +00:00
Julian Smart
8f0e43661a Fixed wrong line spacing calculation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-30 11:27:42 +00:00
Julian Smart
602a592c22 Don't add space before para twice in paragraph layout
Discard attributes from empty text object when merging


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-30 08:47:23 +00:00
Robert Roebling
e9a680ccc5 include wx/sizer.h as buildbot complained
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-29 12:24:44 +00:00
Robert Roebling
66ddc77b88 Add possibility to use sizers in ribbon panel, fixes #12404: wxRibbonPanel and wxSizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-29 09:42:55 +00:00
Václav Slavík
c063e45035 Scale sizes more accurately in generic SetWindowVariant().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-28 17:05:02 +00:00
Jaakko Salli
aae9e5bd56 Changed wxArrayStringProperty default delimiter to comma. It should allow for better looking and more easily editable property values for common cases.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-26 13:51:45 +00:00
Jaakko Salli
6f631217a9 Added missing wx/defs.h includes in propgrid headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-26 13:25:07 +00:00
Jouk Jansen
be82fa6989 correcting wxX11 for wxkeysym as was done for wxMOTIF
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-26 06:53:51 +00:00
Václav Slavík
a614ffae71 Fix wxListBox selection handling broken by r64500.
r64500 introduced tracking of previous selection in wxMSW's wxListBox so
that an event isn't sent when the user clicks already selected item
again. Unfortunately, it forgot to account for programatic changes of
selection (e.g. when all items are removed, so is the selection) and
didn't update selection book-keeping information in that case. The
result was that the event wasn't sent when it should be in some cases.

Fixed by using UpdateOldSelections() even in single-selection case in
wxMSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-25 15:02:30 +00:00
Robert Roebling
a6856aa899 Reenable sorting tests for GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-24 17:22:12 +00:00
Robert Roebling
625ed74301 Make sorting of wxListBox, wxChoice and wxComboBox identical to the MSW sorting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-24 17:06:15 +00:00
Vadim Zeitlin
16e4586527 Remove unused wxDisplay implementation using DirectDraw from wxMSW.
Remove commented out version of DirectDraw-based wxDisplayFactory
implementation. It doesn't seem to have any advantages compared to the
currently used version and nobody uses it anyhow.

Closes #12387.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-24 11:36:43 +00:00
Jouk Jansen
590e326472 wxKeysym problem for wxMOTIF fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-24 11:23:22 +00:00
Vadim Zeitlin
39f3816783 Compilation fix: forward declare wxTextEntry in unit tests code.
This should fix tests compilation on the build bot Mac OS X slaves.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-23 18:54:59 +00:00
Jouk Jansen
0772565873 Update openVMS compile support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-23 07:50:00 +00:00
Vadim Zeitlin
8859c7293e Use "C" locale for locale-dependent part of TextCtrlTestCase.
As we expect to get decimal points in the text control when we stream floating
point numbers into it, we must do it in a locale which uses decimal point,
e.g. "C" one. Otherwise the test failed when ran in e.g. French locale.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 23:46:02 +00:00
Vadim Zeitlin
83527a0ab2 Document that wxFD_FILE_MUST_EXIST is implied under OS X.
Mention in the documentation that the standard file open dialog under OS X
can't be used to select a non-existing file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 23:45:58 +00:00
Vadim Zeitlin
2edda9670b Remove unused src/osx/cocoa/bmpbuttn.mm file.
This file was empty and unused any more so simply remove it and all references
to it in the makefiles.

This avoids warnings about empty object files in static builds of the library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 23:45:53 +00:00
Vadim Zeitlin
453296e78b Don't use uninitialized variable in wxCharCodeWXToOSX().
If an unsupported wxKeyCode was passed to this function, an undefined value
was returned. Return -1 instead to indicate failure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 22:58:25 +00:00
Vadim Zeitlin
232fdc630c Merge the new GUI tests from SOC2010_GUI_TEST branch.
Add a lot of tests for many wx GUI classes.

Add tests using the new wxUIActionSimulator class but disable them under OS X
as too many of them currently fail there.

Refactor the test suite to make organizing the existing tests and adding the
new ones easier.

Improve documentation using the information gathered while testing the
classes. Also update the documentation of the testing system itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 22:16:05 +00:00
Vadim Zeitlin
571d991bb3 Merge wxUIActionSimulator fixes from SOC2010_GUI_TEST branch.
Correct a lot of problems with the initial implementation, notably make the
API consistent across all platforms, e.g. all keyboard-related methods now
take just a wxKeyCode.

Add some useful higher-level helpers such as Text() and MouseDragDrop().

Improve documentation.

wxUIActionSimulator now works under MSW, GTK and OS X and is enabled by
default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 22:15:42 +00:00
Vadim Zeitlin
6f07c007a5 Fix selection corner cases in wxOSX wxComboBox.
Don't crash in wxComboBox::GetString() if it's passed an invalid index.

Don't call GetString() with invalid index from GetStringSelection() if there
is no selection.

Do accept wxNOT_FOUND in SetSelectedItem() as it means, according to the docs,
that the existing selection should be reset.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 22:15:32 +00:00
Vadim Zeitlin
5623dce7cd Don't crash in wxOSX::wxClipboard::Clear() if initialization failed.
Creating the clipboard may fail (e.g. when running from a ssh session to an OS
X machine), don't crash by passing NULL pointer to PasteboardClear() if this
happens but assert and return instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 22:15:27 +00:00
Vadim Zeitlin
45d1c40a91 Work around a crash on starting editing in wxGrid under wxOSX/Cocoa.
wxOSX/Cocoa currently generates unexpected focus loss events with the window
gaining focus being the same one as losing it. This is wrong and shouldn't
happen but as long as it does, filter these events out to at least allow
editing the grid to work.

See #12267.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 22:15:22 +00:00
Vadim Zeitlin
4b97af90bf Don't send event from wxMSW::wxListCtrl::DeleteAllItems() if it did nothing.
wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS should only be sent if the control hadn't
been empty before. Document this behaviour and adjust wxMSW to match the
other platforms.

Also document the return value better.

Closes #12336.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 22:15:17 +00:00
Vadim Zeitlin
acdc8633de Extract X11 Display wrapper class in a private header.
No real changes, just extract a private Dpy class used by wxGTK to a header
and rename it to wxX11Display.

This will allow reusing it from X11 wxUIActionSimulator implementation in the
upcoming commits.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 22:15:13 +00:00
Vadim Zeitlin
1c9039c352 Add missing header required if wx/mousestate.h is included first.
This header uses wxPoint so it must include wx/gdicmn.h (instead of relying on
it having been already included).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 22:15:07 +00:00
Vadim Zeitlin
686d0cc0a6 Don't report spurious errors from wxSocket in "no wait" mode.
In wxSOCKET_NOWAIT mode wxSOCKET_WOULDBLOCK is not a real error as it's
expected and should be just discarded. Failing to do this could result in the
following scenario:

1. Try to read a big buffer with wxSOCKET_NOWAIT (setting wxSocket error to
   wxSOCKET_WOULDBLOCK).
2. Process small part of it.
3. Read more data from wxSocket -- which now goes to the data containing
   already cached data without going to the socket itself and this without
   resetting the error.
4. Check wxSocket::Error() which turns out to be (still) true.

And this was exactly what happened in mysteriously failing unit test case
reading wxImage contents from a socket: the failure was difficult to reproduce
because it depended on how much data exactly did we read from the socket in
one go.

Fix this by resetting the error properly and reenable the unit test which was
previously disabled for the build bot, it should pass now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-21 23:33:40 +00:00
Robert Roebling
2dd62dc008 Allow calling wxGenericDirCtrl::GetPath() in multiple selection mode, fixes #12340 ([wxGenericDirCtrl] conflicts wxDirFilterListCtrl::OnSelFilter())
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-21 10:17:13 +00:00
Robert Roebling
c9248ddbef make Set/GetLabel() set and return something (albeit unused) as per the docs, fixes #12350: wxWindow Get/SetLabel non-functional in GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-21 09:54:30 +00:00
Robert Roebling
a03b38ef68 make Set/GetLabel() set and return title in wxTLW, fixes #12371: Dialog::GetLabel() Inconsistent behaviour across operating systems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-21 09:53:25 +00:00
Robert Roebling
f6ac1f4b38 Fix crash by checking if icon is valid before drawing it, fixes #12376: PATCH for Ribbon crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-21 09:39:09 +00:00
Robert Roebling
f79cf73292 Fix potential crash, fixes #12375: PATCH to fix help controller crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-21 09:36:12 +00:00
Robert Roebling
c225708fd4 Properly implement Cleared() by calling row_deleted on every child of root, fixes #12327: wxDataViewListCtrl Crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-20 20:51:17 +00:00
Vadim Zeitlin
f3b21e123e Mention that not all standard IDs are stock IDs.
Also add a link to the list of stock IDs from the standard IDs documentation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-20 18:13:51 +00:00
Jouk Jansen
b9d0da6f6f include correct private.h for wxgtk1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-20 15:38:03 +00:00
Robert Roebling
ec080ef187 Make it compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-20 15:22:52 +00:00
Robert Roebling
0800eb846c Link to wxRichMessageDialog in some places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-19 18:29:46 +00:00
Robert Roebling
03d291d933 Make it compile a bit more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-19 18:17:51 +00:00
Vadim Zeitlin
8d5016b18b Slightly improve wx[Generic]RichMessageDialog layout.
Keep the icon at the top instead of centering it, this is more consistent with
the native behaviour under both MSW and GTK.

Get rid of an unnecessary sizer in wxGenericRichMessageDialog and give the
checkbox the right border to align with the rest of the dialog contents.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-19 15:41:24 +00:00
Vadim Zeitlin
c79510ca12 Make the main message of wxGenericMessageDialog stand out.
Use larger bold font for the main message in wxGenericMessageDialog if the
extended message is also given to make it stand out similarly to how it
happens in the native GTK and MSW dialogs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-19 15:41:18 +00:00
Julian Smart
9a3551d3f4 Better close button placement on tabs, especially for bottom tab alignment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-19 12:12:59 +00:00
Jouk Jansen
f0dd5fd97d update compile configuration for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-19 07:13:01 +00:00
Vadim Zeitlin
8908317871 Compilation fix for STL build in wxGtkCollatableString code.
Include wx/string.h to define wxString used by this class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-19 00:06:17 +00:00
Vadim Zeitlin
d482d5e468 Compilation fix for non-PCH build in wxGenericRichMessageDialog code.
Move IsCheckBoxChecked() to the .cpp file where wxCheckBox is fully defined
and not just forward declared (at least when not using PCH).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-19 00:06:12 +00:00
Vadim Zeitlin
84bf3902cf Compilation fix for old SDKs in new native MSW wxHyperLinkCtrl code.
Define WC_LINK ourselves if it's not defined in the headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 23:57:26 +00:00
Vadim Zeitlin
b00403b401 VC6 compilation fix for native wxProgressDialog implementation.
Don't use return with a void value, VC6 doesn't support this and it's
unnecessary here anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 23:55:52 +00:00
Vadim Zeitlin
c31d9c7f60 Use task dialog for wxProgressDialog implementation in wxMSW.
If available, the task dialog is now used for the wxProgressDialog under
Windows. This provides a much more native looking dialog which doesn't look
out of place under modern Windows versions, unlike the generic implementation.

The internals of the code had to be significantly changed as the task dialog
can only be shown modally so, to emulate wxProgressDialog modeless nature, a
separate thread is used for the progress dialog management.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:49:02 +00:00
Vadim Zeitlin
c0938d8506 Only use native wxHyperlinkCtrl in Unicode build under MSW.
The native control is available to Unicode applications only so disable its
use in non-Unicode build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:48:53 +00:00
Vadim Zeitlin
8220f2f145 Don't use native MSW wxCommandLinkButton in wxUniversal.
Test for __WXUNIVERSAL__ when selecting the version of this class to use.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:48:48 +00:00
Vadim Zeitlin
a1bdd4ab9b Add wxRichMessageDialog class.
This is a generalization of wxMessageDialog based on the native task dialog
under recent (Vista and later) Windows versions and implemented generically
for the other ports for now.

It provides the possibility to use additional controls in the message boxes
(checkbox useful for the "Don't ask me again" kind of dialogs and collapsible
detailed explanations field) and better look and feel under Windows.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:48:41 +00:00
Vadim Zeitlin
ede7b01760 Provide a task-dialog based wxMSW wxMessageDialog implementation.
Use the task dialog instead of the legacy message box for wxMessageDialog
implementation under wxMSW on recent (Vista and later) Windows versions.

As part of this change, remove wxMessageDialogWithCustomLabels and integrate
its functionality in wxMessageDialogBase itself as it's now used by all
platforms.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:48:28 +00:00
Vadim Zeitlin
5a607f8b23 Handle mnemonics correctly in wxGTK::wxCollapsiblePaneSetLabel().
Convert mnemonics in wx format to the one used by GTK+, just as we already do
in the ctor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:48:21 +00:00
Vadim Zeitlin
2afba7c46c Fix Yes/No/Cancel buttons order in wxGTK wxStdDialogButtonSizer.
"Yes" and "No" buttons should be positioned next to each other for consistency
with the native message box instead of separating them with the "Cancel"
button.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:48:15 +00:00
Robert Roebling
8eb99915f2 Document recetnyl added name parameter in wxDataViewCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 21:40:24 +00:00
Robert Roebling
343e567e3e Mention that you cannot call wxRadioButton::SetValue(false) if that radiobutton belongs to a group
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 21:36:40 +00:00
Robert Roebling
b8710bbee8 GTK+ just won't let you uncheck any radiobutton that belongs to a group.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 21:32:14 +00:00
Robert Roebling
c272f12ff0 make wxChoice and wxComboBox sort in a case insensitive and locale adapted way, fixes #12351: Incorrect sort order in wxChoice / wxComboBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 21:29:53 +00:00
Robert Roebling
1aeaccf310 Make wxListBox sort in a case insensitive way, fixes #12352: Incorrect sort order in wxListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 21:28:11 +00:00
Julian Smart
a94656538f Use common inline version of wxHexToDec
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 12:59:52 +00:00
Vadim Zeitlin
b815cf68d2 Provide native wxHyperlinkCtrl implementation for wxMSW.
Use the "syslink" native control to implement wxHyperlinkCtrl under (recent
enough, i.e. XP or later) versions of Windows.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-17 16:55:32 +00:00
Vadim Zeitlin
8fe8b421fc Compilation fix: include wx/button.h from wx/commandlinkbutton.h.
Include the base class declaration to fix compilation under non-MSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-17 16:12:28 +00:00
Vadim Zeitlin
c6d4b3ce9d Export wxMSWButton::GetFittingSize() private function.
It is now used by wxCommandLinkButton from adv library and so needs to be
exported from core.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-17 15:13:14 +00:00
Vadim Zeitlin
3571e1add4 Add new wxCommandLinkButton class.
A command link button wraps a native MSW control under recent Windows versions
and is implemented generically as a simple bitmap button elsewhere.

In the future, GTK implementation should allow using a different font for the
button label and its note.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-17 14:48:50 +00:00
Julian Smart
dd71bfb992 Large image-loading speedup and small attribute-loading speedup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-17 10:10:39 +00:00
Stefan Csomor
3f16e51be8 fixes horizontal scrolling in textfields, fixes #12322
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-17 06:21:53 +00:00
Robert Roebling
9572bf1d44 Ignore non-existant string selection in wxComboBox::SetValue() in read-only mode, as per the very exact docs, fixes #12329: wxComboBox can set non-existing string in read only mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-16 17:48:28 +00:00
Robert Roebling
bdf90a1a1c Uncheck radiobutton when calling ::SetValue(false) as per wxMSW, fixes #12344: Cannot set GTK wxRadioButton to fasle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-16 15:33:31 +00:00
Vadim Zeitlin
a183ec7094 Improve EVT_SHOW documentation.
Mention that it applies to the TLWs only and explain when it is generated (and
not generated).

Closes #12353.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-15 21:14:11 +00:00
Vadim Zeitlin
9106ea703c Fix wxMSW compilation in wxUSE_STL==1 case.
A wxDECLARE_NO_ASSIGN_CLASS() was recently added to ClassRegInfo but storing
it in a vector requires it to be "Assignable" so this broke compilation in STL
case (wxVector<> doesn't enforce this requirement currently).

Make ClassRegInfo assignable again to fix this.

Closes #12355.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-15 21:14:06 +00:00
Vadim Zeitlin
6008ff4a55 Revert "Make wxComboBox::Popup() and ::Dismiss() emit events"
This reverts commit r65310 which was not, in fact, necessary as the events
were already sent.

See #12335.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-15 21:14:02 +00:00
Robert Roebling
26c7026db3 Make wxComboBox::Popup() and ::Dismiss() emit events as per the docs, fixes (wxComboBox not sending popup and dismiss events)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-15 16:16:22 +00:00
Jaakko Salli
15ec7f782d Allow wxVariant::Convert(wxUniChar* value) to convert single-character string into a character.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-13 20:12:03 +00:00
Vadim Zeitlin
4082ff84e3 Fix harmless MSVC warning about double to float conversion.
Make the constant double as well as it's compared with other doubles in the
code below.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-13 11:57:45 +00:00
Vadim Zeitlin
2fe9180bfe Update wxWinCE compilation instructions.
Remove obsolete information about eVC. Give the example of using bakefile to
generate VC[89] CE projects directly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-13 09:55:32 +00:00
Stefan Csomor
128ad18349 no-op change to get build bot running
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-13 04:23:37 +00:00
Stefan Csomor
b70ee0382a no-op change to get build bot running
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-12 08:25:16 +00:00
Javier Torres
dd5167e0bf New build slave for wxQt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-11 23:11:24 +00:00
Peter Cawley
1edd60790b Improve wxRibbonMSWArtProvider's colour scheme generation when the primary and/or secondary colours are grey (see ticket #12331).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-11 16:51:02 +00:00
Vadim Zeitlin
e08b4823e8 Handle wxDefaultSize correctly in wxNonOwnedWindow under wxOSX.
Creating a wxNonOwnedWindow with default size created tiny, practically
invisible windows because the default size was only taken care of at
wxTopLevelWindow level but not in wxNonOwnedWindow itself. In particular, this
broke creation of wxMDIChildFrames with the default size as this class only
derived from wxNonOwnedWindow and not from wxTopLevelWindow under OS X. It
also probably wasn't intentional as the code did use {Width,Height}Default()
functions but they were wxWindow methods and not the wxTopLevelWindow
(confusingly and error-pronely) named the same.

Fix this, remove the now redundant checks for the default size in
wxTopLevelWindow itself and also rationalize and condense the checks for the
default position and size components in wxNonOwnedWindow::Create().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-11 16:04:00 +00:00
Vadim Zeitlin
71a0f42d2a Make wxTopLevelWindow::GetDefaultSize() public and document it.
This method is/will be needed by wxNonOwnedWindow in wxOSX but couldn't be
used as long as it was protected, so make it public. And as it seems that it
might be useful outside of wx itself, document it as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-11 16:03:55 +00:00
Vadim Zeitlin
06cfc05269 Add wxPoint::IsFullySpecified() and SetDefaults().
These methods do the same thing as wxSize methods with the same names and are
useful for the same reasons.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-11 16:03:51 +00:00
Vadim Zeitlin
01495abf87 Fix handling of help buttons with non-empty label under OS X.
Creating a button with wxID_HELP and a non-empty label used to always show
this label, even if it was just a standard "Help" or "&Help". This didn't work
at all as the help buttons under OS X are too small to show any label.

To fix this, use normal buttons, not help ones, if a really custom label is
used to ensure that it can be seen. And to still use the correct help buttons
in as many cases as possible, ignore the standard "Help" label and its
variants and don't show it at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-11 16:03:46 +00:00
Vadim Zeitlin
34a1414265 Use correct format specifiers in wxString::Printf().
Using %d with size_t argument resulted in asserts, fix it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-11 16:03:04 +00:00
Vadim Zeitlin
1335062151 Fix line indices translation in wxGrid::DoEndDragResizeLine().
We used the translation in wrong direction, i.e. interpreted x coordinates as
rows and y coordinates as columns. This could result in passing invalid cell
indices to GetCellSize() and was generally completely wrong.

Closes #12311.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 22:39:04 +00:00
Vadim Zeitlin
0d2f3b9d7b WIP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 22:39:00 +00:00
Vadim Zeitlin
276f883f7a Don't set Unicode key code in key events to non-Unicode values in wxGTK.
Only assign the wx key code wxKeyEvent::m_uniChar if it's a key corresponding
to an ASCII symbol, don't do it for the values outside of ASCII range such as
all the special WXK_ constants. It doesn't make sense to generate Unicode key
codes for e.g. cursor key presses.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 22:38:54 +00:00
Vadim Zeitlin
27607839f1 Use wxPanel as controls parent in wrapsizer sample.
Follow our own advice about never creating controls directly on the frame and
using an intermediate wxPanel in our own sample. This is better style and
makes it look better under Windows.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 21:48:22 +00:00
Vadim Zeitlin
d931703342 Inherit notebook background recursively under wxMSW.
With MSWSetTransparentBackground() hack only the panel which was the immediate
child of wxNotebook (i.e. its page) inherited the notebook background but not
its children. This resulted in jarring background discontinuities when nested
panels were used.

Fix this by inheriting notebook background in all child panels by testing for
the return value of the parents MSWHasInheritableBackground() method in
wxPanel::HasTransparentBackground() recursively.

Closes #12317.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 21:48:17 +00:00
Vadim Zeitlin
e9f935cb70 Fix wxBitmapButton initial best size determination in wxMSW.
This was broken during wxButton/wxBitmapButton merge and wxBitmapButton was
not created with the correct initial size if the default size was specified
when creating it any longer. Fix this by calling SetInitialSize() once again
after setting the bitmap.

See #12323.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 18:58:06 +00:00
Vadim Zeitlin
1cd44b9c5f Keep the button bitmap centered if the button has no label in wxMSW.
We should only honour the bitmap alignment if the button shows both the bitmap
and the label. If only the bitmap is shown (e.g. when wxBitmapButton is used),
it should always be centered as it used to be done in 2.8.

Closes #12323.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 18:58:02 +00:00
Vadim Zeitlin
aa83b6fc90 Remove obsolete and out of date Xcode project file.
The project files under build/osx should now be used, this Xcode project file
was out of date and couldn't be updated automatically.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 18:57:56 +00:00
Vadim Zeitlin
563cf28f2a Revert MSW window classes uniquification patch.
Making the class names unique doesn't seem to be necessary so revert the patch
which appended unique pointer value to their names (r57030).

See #9031.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 18:57:51 +00:00
Vadim Zeitlin
5ed0415e3e Don't use bitmap still selected in wxMemoryDC in image sample.
The bitmap must be deselected from wxMemoryDC before being used in any other
way but the sample didn't do this. Fix this by simply destroying the DC as
soon as we don't need it, this makes bitmap available for other use as well.

Closes #12310.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 18:57:47 +00:00
Vadim Zeitlin
5784031727 Use window position in screen coordinates in wxDisplay::GetFromWindow().
To determine the display to which the window belongs we must use the window
position in screen coordinates returned by wxWindow::GetScreenRect() and not
the positioned returned by GetRect() which is the same only for the top level
windows but not for the child ones.

Closes #12318.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 18:57:42 +00:00
Vadim Zeitlin
18ff59a401 Correct documentation of majorDimension in wxRadioBox ctor.
The default value of this parameter is 0, not 1. Also add the explanation of
what using 0 actually means.

Closes #12325.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 18:57:36 +00:00
Vadim Zeitlin
dbf9c0cdc1 Remove obsolete stc makefile.
This makefile is not used any more since stc was integrated into wx core.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 18:57:31 +00:00
Vadim Zeitlin
80ce465c64 Add wxDataViewCtrl::{Set,Get}CurrentItem().
Current item is the same as the selected item in single selection mode but in
multiple selection mode there was no way to neither get this item nor change
it before so add the new functions to allow doing this now.

The new methods are implemented for the generic, GTK and OS X/Cocoa versions
but only stubs are provided for OS X/Carbon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 12:53:03 +00:00
Vadim Zeitlin
1e18430004 Don't lose selection in wxDataViewCtrl::Select() under Mac.
Calling Select() for an item should not deselect the other selected items in
multiple selection mode. This is consistent with the GTK and generic versions
behaviour and also just makes more sense but also document that this is indeed
the desired behaviour just in case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-09 21:17:51 +00:00
Jaakko Salli
6c78066f22 Moved wxPGProperty::SetFlag() to protected API since it does not have any side-effects that are usually desired in the user code. Added wxPGProperty::SetAutoUnspecified() since wxPG_PROP_AUTO_UNSPECIFIED can no longer be set (conveniently) with SetFlag().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 12:22:08 +00:00
Jaakko Salli
346f3fd640 Removed spurious semicolon that prevented compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:59:34 +00:00
Jaakko Salli
9ceed261f8 Added wxPGProperty::Enable() for conveniency. Refactored related code and improved related documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:41:20 +00:00
Vadim Zeitlin
62e9285aba Add name argument to wxDataViewCtrl ctor for consistency.
As all the other wxWidgets controls take the parameter in their ctor/Create()
it's unexpected that wxDataViewCtrl does not. Add the name parameter and pass
it to wxWindowBase::CreateBase() as usual.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:37:57 +00:00
Vadim Zeitlin
033a5ff5c7 Don't export wxDataViewCtrlInternal unnecessarily.
wxDataViewCtrlInternal is a private class used only inside wxWidgets itself
and doesn't need to be exported from the shared library, so remove the
unnecessary WXDLLIMPEXP_ADV from its declaration.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:37:50 +00:00
Vadim Zeitlin
4e848be7f6 Fix dataview sample compilation with wxUSE_DRAG_AND_DROP==0.
This allows to build it under wxX11. Unfortunately it still doesn't work at
all there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:37:46 +00:00
Vadim Zeitlin
0c2a727057 Use helper class instead of manually calling gtk_tree_path_free().
No real changes, just simplify the code and make it more obviously correct by
ensuring that all temporary tree paths are always destroyed because they are
assigned to a wxGtkTreePath object which does it in its dtor instead of
calling gtk_tree_path_free() manually every time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:37:41 +00:00
Vadim Zeitlin
17d98558b3 Add wxDataViewCtrl::GTKPathToItem() function and use it.
No real changes, just refactor the code to use a function mapping GtkTreeIter
to our wxDataViewItem and use it instead of duplicating its code everywhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:37:37 +00:00
Vadim Zeitlin
91012d561d Include wx/defs.h before testing for wxUSE_CHECKLISTBOX.
We need to include wx/defs.h that (indirectly) defines wxUSE_CHECKLISTBOX
before testing for it in wx/checklst.h, otherwise the test may fail if the
latter header is the first wx header included by the user code.

Closes #12306.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:35:55 +00:00
Vadim Zeitlin
d89b7c194d Correct a print format specifier mismatch in wxFileConfig::Parse().
Pass an int and not a size_t to a %d.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-08 11:35:49 +00:00
Bryan Petty
a9445eb48b Added the documentation for wxMemoryBuffer::AppendData(), it was lost in the Doxygen conversion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-06 20:14:39 +00:00
Václav Slavík
aecf930c5e Fix DnD in generic wxDataViewCtrl when scrolled.
wxDataViewMainWindow drag and drop code incorrectly used Y coordinate
where X axis should be used to check whether the mouse is inside columns
area. This manifested itself as refusing to accept drops once the
control was sufficiently scrolled down.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-06 16:28:46 +00:00
Václav Slavík
926649a996 Fix attributes escaping when writing XML.
wxXmlDocument didn't correctly escape some characters that the spec says
must be escaped. Behaves correctly now.

Fixes #12275.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-04 14:57:30 +00:00
Julian Smart
bbd55ff956 Don't reset bullet number and outline number when applying style sheet.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-03 17:15:33 +00:00
Václav Slavík
a492bccff9 Fix MSVC warning about int->bool conversion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-03 12:59:30 +00:00
Václav Slavík
0826c4d39a Fix Tab navigation when focused control is disabled.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-01 10:11:53 +00:00
Václav Slavík
ce5abbf9f5 Fix wxDataViewCtrl to omit expander space for all kinds of lists.
List-only models don't have expanders and so the control shouldn't
reserve any space for them; the notion of expander column doesn't make
sense here.

Previously, this was done correctly only for wxDataViewVirtualListModel;
"ordinary" list models, such as the one used by wxDataViewListCtrl, were
treated as generic tree models and 0th column had ugly empty space
reserved for (never used) expander.

This patch fixes it by adding IsListModel() helper function in
addition to existing IsVirtualListModel(). Some of the
IsVirtualListModel() tests were changed into IsListModel() checks as
appropriate.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-29 20:54:00 +00:00
Robert Roebling
e78778c8e2 Add ability to render checkbox in undeterminate state, fixes #12290: wxRendererGTK does not support wx.CONTROL_UNDETERMINED for checkboxes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-29 16:57:09 +00:00
Václav Slavík
780e4fd003 Fix gcc warning in wxDataViewListCtrl::ItemToRow().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-29 15:30:11 +00:00
Vadim Zeitlin
c8eab84f83 Fix wxOSX wxTextCtrl refactoring of r65129.
Add the Init() calls in wxNSTextFieldControl ctors forgotten the last time.

Closes #12284.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-28 18:22:26 +00:00
Vadim Zeitlin
40c4350f96 Allow non-modal windows shown from modal dialogs to work in wxOSX.
Use kCGUtilityWindowLevel for such windows instead of kCGFloatingWindowLevel
and also call setWorksWhenModal:YES.

Closes #12187.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-28 18:22:20 +00:00
Vadim Zeitlin
c072b9ec8a Add association between wxOSX wxTextWidgetImpl and wxTextEntry.
This allows to always find the correct wxTextEntry to use in the
implementation of text-related widgets without using any casts. Notably, the
wrong up-cast of wxWindow to wxTextCtrl in wxNSTextFieldControl::controlAction()
which resulted in a crash when the window was actually a wxComboBox can now be
fixed.

Closes #12284.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-28 11:27:01 +00:00
Vadim Zeitlin
f50d84586a Correct the check for MRU menu items range.
The last id of the range if offset by the first one by the number of items in
the menu, not the base id of the file history menu.

Closes #12141.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-28 11:26:49 +00:00
Vadim Zeitlin
1ef352a926 Correct id in the wxRichTextCtrl::OnUndo() documentation.
wxID_PASTE was wrongly used instead of wxID_UNDO.

Closes #12278.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-28 11:26:41 +00:00
Vadim Zeitlin
54cbdc6414 Return after activating already opened document in wxDocManager.
Add accidentally omitted "return" in wxDocManager::CreateDocument() to prevent
recreating already opened documents.

Closes #12277.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-28 11:26:33 +00:00
Vadim Zeitlin
4a49fa24c9 Fix harmless float to int conversion warnings in wxOSX build.
Add casts to truncate the values as the code intended anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-28 11:26:26 +00:00
Vadim Zeitlin
6178debcd3 Correct format specifiers used to show wxIPV4address.
wxIPV4address::IPAddress() used %lu to show each of (byte-sized) IPv4 address
components for some reason, which resulted in asserts about format specifier
mismatch. Fix this by just using %u.

Closes #12272.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-28 11:26:14 +00:00
Václav Slavík
fa629adae4 Add index-based selection functions to wxDataViewListCtrl.
These are convenience functions for work working with indexes, for
consistency with other wxDataViewListCtrl methods.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-27 21:45:50 +00:00
Václav Slavík
17de95e4e0 Add item<->row mapping helpers to wxDataViewListCtrl.
These are commonly needed when using wxDataViewListCtrl, yet they were
only available in wxDataViewIndexListModel.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-27 21:45:45 +00:00
Václav Slavík
9ba389145a Created the model in wxDataViewListCtrl::Create().
It was totally unexpected that construction through the ctor behaved
differently from Create(). Also, the behavior now actually matches
documentation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-27 21:45:37 +00:00
Václav Slavík
b390729ff9 Allow empty message in wxRearrangeDialog.
If the message is empty, don't reserve space for it at the top; instead,
just make the dialog a bit smaller.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-27 21:45:29 +00:00
Robert Roebling
a3a8d81d48 Let wxMSW report wxDataViewCustomRenderer::LeftClick() report the click position relative to the inner cell, not the window - as in wxGTK, fixes #12270: wxDataViewCustomRenderer::LeftClick behaves differently under wxGTK and
wxMSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-27 17:04:44 +00:00
Francesco Montorsi
9b756edd0d mention wxSystemSettings::GetColour() in wxWindow::SetBackgroundColour() docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-27 09:21:22 +00:00
Francesco Montorsi
6333ffcca0 add a spacer in case the progress dialog is built without labels (elapsed/estimated/remaining) time nor buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-26 10:28:36 +00:00
Vadim Zeitlin
54f0a3242c No changes, just use traditional English name for Mozart's work.
In English, this work (K. 525) is always referred to with its indefinite
article included and its appearance without it is jarring.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-26 10:08:19 +00:00
Robert Roebling
37494cb336 Minor correction to smart pointer docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 19:45:24 +00:00
Robert Roebling
a36bceb633 Tried to make wxDataViewModel docs clearer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 19:27:07 +00:00
Vadim Zeitlin
354a9ddf94 Only define WXUSINGDLL in multilib builds for wxscintilla.lib.
In monolithic builds wxscintilla is linked directly into the one and only wx
DLL and doesn't need to import anything from it, WXUSINGDLL is only needed in
multilib case when wxscintilla is part of wxCore DLL and does need to import
symbols (e.g. wxQsort() used by wxVector) from wxBase one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 18:39:22 +00:00
Vadim Zeitlin
833fb475ce No real changes, just rearrange wxCursor::InitFromImage() in wxGTK.
Make it more clear that the function deals with two cases by using if/else
instead of if+return.

Also use smart wxGtkObject pointer instead of calling g_object_unref()
manually.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 18:39:16 +00:00
Vadim Zeitlin
5a9dd92128 Correct creation of the mask for wxImage cursors in wxGTK.
The code created the monochrome bitmap used by wxCursor(wxImage) ctor
incorrectly resulting in bad cursor appearance. Use the right values for
foreground and background pixels (which are inversed compared to naive
expectations) to fix this.

Closes #11989.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 18:39:10 +00:00
Francesco Montorsi
89a76d5d2c make POSIX and Windows implementation of wxThread::Run() coherently assert when trying to Run() a thread twice; add a test for it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 13:55:36 +00:00
Julian Smart
79b7701c0b Fix VC++ compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 13:34:16 +00:00
Francesco Montorsi
695d5232ec fix double documentation for the same wxLogTrace() functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 13:23:30 +00:00
Francesco Montorsi
54e280d860 refactor wxLog documentation moving verbose parts to the wxLog overview and grouping similar wxLog functions together
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 11:53:54 +00:00
Vadim Zeitlin
128eed6c64 Build fix: don't test for __WXMSW__ using #if in wx/defs.h.
__WXMSW__ should be tested using #ifdef but in fact there doesn't seem to be
any need to test for it at all here as __CYGWIN__ implies __WXMSW__ anyhow.

Closes #12266.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 11:42:43 +00:00
Francesco Montorsi
c02f03d563 do not add files in wxDebugReport::AddFile if copy failed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 11:26:04 +00:00
Francesco Montorsi
b2025b311a small doxygen warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 11:24:38 +00:00
Francesco Montorsi
ef7f03ad83 preserve doxygen 1.6.x look also with doxygen 1.7.x: it produces more readable navigation tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 11:05:43 +00:00
Jaakko Salli
7197bbad21 Refactored validation of numeric properties (wxIntProperty, wxUIntProperty and wxFloatProperty). They now use (basically) a single template function instead of three separate ones.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 10:36:19 +00:00
Francesco Montorsi
660b61d7e3 wxGraphics* classes are all ref-counted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 09:54:44 +00:00
Francesco Montorsi
9ccf8289ee add tables of events related to wxAuiManagerEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 09:54:18 +00:00
Francesco Montorsi
4a31544cb5 no real change: just follow wx typical commenting style and separe // from the following characters with a space
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 09:52:13 +00:00
Jaakko Salli
5eedcd5eee Added wxVariant::Convert() implementations for wx(U)LongLong_t, so that wxVariant can be converted to native 64-bit integer types on the same terms as it is converted to other numeric types (useful in e.g. template functions)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 09:30:50 +00:00
Jaakko Salli
6a0a70c979 Set 'Min' attribute for the sample wxFloatProperty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 09:23:25 +00:00
Jaakko Salli
ec88eb712e Use default wxPropertyGrid validation failure behavior in the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 09:19:52 +00:00
Jaakko Salli
ed8f00db2c Make SetFont() public (fixes #9641)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 07:39:17 +00:00
Vadim Zeitlin
6d50f0a0ed Only define WXUSINGDLL in DLL configurations when building wxscintilla.
WXUSINGDLL shouldn't be defined in static build configurations, this results
in warnings and might explain errors in MinGW build.

Closes #11966.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:19:06 +00:00
Vadim Zeitlin
1ba904fea1 No real changes in makefile but avoid repetitious in bakefile.
Collect all preprocessor options needed for Scintilla compilation in
wxscintilla_cppflags template and use for both Scintilla compilation itself
and for the wx libraries using it.

The order of flags in the makefiles has changed but they are still the same
except for Borland makefile which now includes Borland-specific warning
suppression option everywhere it's needed and not just in multilib targets.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:18:57 +00:00
Vadim Zeitlin
1784742ca7 No changes, just remove hard TABs and fix a typo.
Separate trivial changes from subsequent commits.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:18:51 +00:00
Vadim Zeitlin
157f035ab1 Update the version tech note to remind to rebake.
Insist on the fact that version.bkl (which is not updated by the script) must
be updated and makefiles rebaked after any version change.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:18:46 +00:00
Vadim Zeitlin
13c873f8ec Upgrade version in the bakefiles to 2.9.2 as well and rebake.
Rebake makefiles to update the name used for the shared libraries to reflect
the new version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:18:34 +00:00
Vadim Zeitlin
7fb5d9e4cf Remove asserts in wxMSW::wxTLW::SetIcons() and always set some icon.
In practice having the icons of the exact size for all versions of Windows is
not always possible, there are just too many of them. So set the icon of the
most suitable size if no exact match is found instead of asserting in this
case.

See #11146.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 17:43:47 +00:00
Michael Wetherell
7b8e38beef Fix buildbot build 'Linux i386 wxGTK stable STL' building wrong branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 15:32:57 +00:00
Robert Roebling
9ca2afd1db Make calls wxDataViewModel::ItemDeleted() etc. non-virtual as they are not supposed to be overridden
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 15:30:03 +00:00
Vadim Zeitlin
cbc751bc56 Don't show empty sizers.
Revert the change of r44514 and do hide the empty sizers. Code relying on them
being shown/positioned should use wxRESERVE_SPACE_EVEN_IF_HIDDEN flag but
assuming it by default results in completely unexpected layouts, e.g. still
using margins around a sizer with hidden window if it contains an empty
sub-sizer.

Closes #11426.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 12:27:34 +00:00
Vadim Zeitlin
5bdeabafbe Postpone showing the notebook pages under wxOSX/Cocoa.
Showing the selected notebook page immediately when it's selected can result
in the top level parent of the notebook being shown prematurely, so don't do
this until the notebook itself is shown.

Closes #12227.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 12:27:29 +00:00
Vadim Zeitlin
1aff4201c3 Add EVT_RIBBONGALLERY_CLICKED event.
This event is sent whenever an item is clicked, even if it's already selected,
unlike the existing EVT_RIBBONGALLERY_SELECTED.

Closes #12128.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 12:27:25 +00:00
Vadim Zeitlin
9899a70bc0 Remove hard limit on number of pages in wxHtmlPrintout.
This seems to be a leftover from an old version in which the page breaks
positions were stored in a fixed size array. As the code uses a dynamic array
now there doesn't seem to be any reason to impose any limit on the number of
pages and some people did run into the old 999 pages limitation apparently.

Closes #11159.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 12:27:18 +00:00
Vadim Zeitlin
e39877cdb7 Remove selection showing code from the grid sample.
This code is broken as it doesn't always show the selection correctly and
doesn't handle rows-or-columns selection mode at all. Until we can fix it
properly it's better to not have it at all so that at least people avoid
copying the wrong code into their own programs.

Closes #12195.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 11:56:11 +00:00
Vadim Zeitlin
b08cf4f401 Document wxGridSelectRowsOrColumns selection mode.
See #12195.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 11:56:06 +00:00
Vadim Zeitlin
9ea83ebc7c Add test for a custom cursor to the image sample.
Load a cursor from PNG file to check that it appears as expected.

See #11989.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 11:49:05 +00:00
Vadim Zeitlin
f3cf14a905 Fix AUI compilation without PCH after recent changes.
r65061 broke PCH-less compilation as it used wxClientDC without (forward)
declaring it. Fix this and also correct wxAuiPaneInfo forward declaration.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 11:23:17 +00:00
Vadim Zeitlin
76e15cbd72 Update BUILD and DEBUG_{FLAG,INFO} documentation for wxMSW.
The documentation was completely out of date and hence very misleading.

Closes #12244.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:44:05 +00:00
Vadim Zeitlin
e80264fdbe Remove mentions of wxUSE_ODBC from documentation.
This option doesn't exist any more in 2.9.

See #12244.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:44:00 +00:00
Vadim Zeitlin
9a7963a97c Implement wxAuiDefaultTabArt::Clone() using its copy ctor.
Compiler-generated copy ctor works just fine for this class, there is really
no reason to reimplement it, especially wrongly (as it loses many and even
most of the fields), in Clone().

Closes #11388.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:51 +00:00
Vadim Zeitlin
4026f044ee Ensure that wxAuiNotebook::SetArtProvider() always does set it.
It used to only set the provider if the height of the tabs defined by the new
provider was different from the one used by the old one, otherwise the call
was optimized away. Fix this by explicitly setting the art provider for all
tabs in SetArtProvider() itself if UpdateTabCtrlHeight() didn't do it.

Closes #9738.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:46 +00:00
Vadim Zeitlin
1632883f9a Fix waiting for IO on UDP sockets.
We mistakenly considered them closed because they were not connected but UDP
sockets don't have to be -- unlike TCP ones.

Closes #11384.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:40 +00:00
Vadim Zeitlin
9741fd45f7 Fix MSW compilation with wxUSE_DEFERRED_SIZING==0.
Add checks for wxUSE_DEFERRED_SIZING around the code using
wxWindow::m_pending{Size,Position}.

Closes #11348.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:36 +00:00
Vadim Zeitlin
568b12fab0 Just call wxDocManager::CloseDocument() instead of duplicating it.
No real changes but avoid making the document deletion code even more opaque
by duplicating the code already existing as a function elsewhere.

Closes #11364.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:32 +00:00
Vadim Zeitlin
ab5259d977 No changes, just slightly improve docview sample code.
Call the base class version of OnClose() in the derived classes instead of
duplicating it.

Closes #11363.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:27 +00:00
Vadim Zeitlin
88ed20a2fa Propagate wxHtmlWindow layout direction to the wxDC it uses.
While wxHtmlWindow doesn't support mixing LTR and RTL contents we can indeed
try to make it render pure RTL stuff correctly by setting up the wxDC used for
drawing accordingly.

Closes #1988.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:23 +00:00
Vadim Zeitlin
69e087c144 Add support for CP-866 encoding to wxEncodingConverter.
Recognize yet another Cyrillic encoding, a DOS OEM one.

Closes #2318.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:16 +00:00
Vadim Zeitlin
e5dcae09e6 Add support for auto-orientable toolbars to AUI.
Allow wxAUI to change the toolbar orientation depending on where is it docked.
It is also now possible to specify wxAUI_TB_VERTICAL or HORIZONTAL to force
the toolbar to be always oriented in the given sense and to prevent it from
being docked at the sides incompatible with it.

Closes #11712.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:10 +00:00
Vadim Zeitlin
43fd7dbd79 Don't assert in wxDataViewCtrl::ItemDeleted() if item doesn't exist.
It seems that it might be valid to delete the items that the GUI control
doesn't know anything about, e.g. this could happen when deleting a child of a
collapsed node in a tree model. So remove the asserts which were triggered in
this case as there doesn't seem to be any way to avoid them with the current
code.

Closes #11802.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:01 +00:00
Vadim Zeitlin
2c83a950a4 Store the result of wxWindow::NewControlId() in wxWindowIDRef.
The result of calling NewControlId() must be assigned to wxWindowIDRef to be
accounted for correctly, otherwise the id was marked as free while a reference
to it still existed resulting in asserts in id management code when we
attempted to reuse it.

Closes #11604.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:32:56 +00:00
Vadim Zeitlin
a5bb451448 Allow passing multi-line strings to wxDC::DrawText(), even under MSW.
Native wxMSW wxDC::DrawText() implementation doesn't support multi-line
strings so use the generic wxDC::DrawLabel() code instead. Drawing multi-line
strings now works at least in wxGTK and wxMSW, to be tested for the other
platforms.

Closes #12239.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:32:52 +00:00
Vadim Zeitlin
715e4f7e3e Fix Cygwin 1.7 build.
Avoid using Cygwin sockets as our code assumes that we use WinSock API under
Windows currently (this might change in the future) by defining
__USE_W32_SOCKETS.

Use new, safer and more efficient cygwin_conv_path() function.

Use t_str() instead of fn_str() with Windows API taking file names, under
Cygwin they are different and using fn_str() is incorrect.

A few other minor fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:32:46 +00:00
Vadim Zeitlin
3d4e20dd0b Added wxFONTENCODING_EUC_KR alias for wxFONTENCODING_CP949.
Although CP949 might not be exactly the same as EUC-KR it appears to be
similar enough and having a more familiar name for it is helpful for people
unfamiliar with Windows nomenclature.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:32:40 +00:00
Vadim Zeitlin
8121433030 Define colours for all wxSYS_COLOUR_XXX values in wxUniv.
Ensure that we have enough elements in the array used by
wxSystemSettings::GetColour() in wxUniv to avoid the assert which happened
when e.g. wxSYS_COLOUR_LISTBOXTEXT was requested from it. This resulted in
an infinite stream of asserts and a crash when trying to use wxTreeCtrl in
wxUniv.

Closes #11702.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:32:35 +00:00
Vadim Zeitlin
e22fa4d7b2 Fix mismatches between format strings and arguments.
This corrects the asserts which are now triggered when the actual arguments
don't match the format string.

Closes #12265.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:32:30 +00:00
Stefan Csomor
76435717cf fixes #12258
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 06:58:36 +00:00
Vadim Zeitlin
f675b4f521 Fix harmless unused parameter warnings in wxDEBUG_LEVEL==0 build.
These warnings were harmless as they concerned the parameters used inside
wxASSERTs only but there were hundreds if not thousands of them in
wx/strvararg.h alone so all the rest of build output was completely lost in
them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 13:42:49 +00:00
Vadim Zeitlin
f5d5adf87d Make --disable-debug[_flag] configure option really work.
We never defined wxDEBUG_LEVEL as 0 meaning that debugging code in wxWidgets
was always enabled, even if --disable-debug_flag or --disable-debug (which
implies it) was given.

Fix this now by adding -DwxDEBUG_LEVEL=0 to CPPFLAGS if necessary.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 13:42:43 +00:00
Vadim Zeitlin
fda43a0e01 Fix compilation of wxSpinCtrlGenericBase when PCH are not used.
This fixes PCH-less compilation broken by r65043.

Closes #12259 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 13:42:38 +00:00
Vadim Zeitlin
713c7336f2 Fix explicitly setting focus to generic wxSpinCtrl.
The control itself can't accept focus as its window is disabled so set the
focus to its text part instead if SetFocus() is explicitly called.

Closes #12259.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 12:16:26 +00:00
Vadim Zeitlin
9bce7b7b13 Update wxSpinCtrlDouble::m_digits in its SetDigits().
We need to update the internally stored information about the number of digits
we use and not just update the control appearance accordingly.

Also don't do anything at all when the number of digits didn't really change.

Closes #12260.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 12:16:19 +00:00
Vadim Zeitlin
888cb61e21 Document wxVector<T>::swap().
Closes #12253.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 12:09:20 +00:00
Vadim Zeitlin
ab9893576c Add wxItemContainer::DetachClientObject() and use it in wxRearrangeList.
Add a method to detach the item from an item control without deleting it and
use it in wxRearrangeList to correctly swap object client data without
deleting the pointers in the process.

Closes #12201.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 12:09:15 +00:00
Vadim Zeitlin
9b481f66e5 Remove executable bits from plist files.
These files probably don't need to be executable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 12:09:10 +00:00
Vadim Zeitlin
f203de0cc4 Replace 2.9.1 version with 2.9.2.
Also update the inc_release script to take src/wxWindows.xcodeproj into
account.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 12:09:04 +00:00
Vadim Zeitlin
ecdbd5b037 Don't mention non-existent setup.exe in wxMSW installation notes.
Also expand setup.h section.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 12:08:54 +00:00
Vadim Zeitlin
8de577bc53 Update the tech note about making new releases with more information.
Mention other release-related things and not only how to create the release
files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 12:08:50 +00:00
Vadim Zeitlin
7832ada05e Explain better relationships between various TLW styles.
In particular mention that wx{MINIMIZE,MAXIMIZE,CLOSE}_BOX can't be used
without wxCAPTION and that wxSYSTEM_MENU ought to be used with it too.

Closes #12246.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-22 12:08:45 +00:00
Chris Elliott
988cece52c script for building chm docs and wxMSW exe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-21 13:56:24 +00:00
4564 changed files with 496777 additions and 331717 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -23,7 +23,7 @@ ac_ext=mm
])
dnl ===========================================================================
dnl macros to find the a file in the list of include/lib paths
dnl macros to find a file in the list of include/lib paths
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_INCLUDES],
[
ac_find_includes=
for ac_dir in $1 /usr/include;
for ac_dir in $1 /usr/include
do
if test -f "$ac_dir/$2"; then
ac_find_includes=$ac_dir
@@ -43,16 +43,17 @@ for ac_dir in $1 /usr/include;
])
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
dnl to the full name of the file that was found or leaves it empty if not found
dnl call WX_PATH_FIND_LIBRARIES(lib name, [optional extra search paths])
dnl sets ac_find_libraries to the full name of the file that was found
dnl or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[
ac_find_libraries=
for ac_dir in $1;
for ac_dir in $2 $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/lib$2.$ac_extension"; then
if test -f "$ac_dir/lib$1.$ac_extension"; then
ac_find_libraries=$ac_dir
break 2
fi
@@ -95,13 +96,13 @@ AC_DEFUN([WX_INCLUDE_PATH_EXIST],
dnl ---------------------------------------------------------------------------
dnl Usage: WX_LINK_PATH_EXIST(path, libpath)
dnl
dnl Set ac_path_to_link to nothing if path is already in libpath of to -Lpath
dnl Set ac_path_to_link to nothing if path is already in libpath, or to -Lpath
dnl if it is not, so that libpath can be set to "$libpath$ac_path_to_link"
dnl after calling this function
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_LINK_PATH_EXIST],
[
dnl never add -L/usr/libXXX explicitely to libpath
dnl never add -L/usr/libXXX explicitly to libpath
if test "$1" = "default location"; then
ac_path_to_link=""
else
@@ -115,6 +116,72 @@ AC_DEFUN([WX_LINK_PATH_EXIST],
fi
])
dnl ---------------------------------------------------------------------------
dnl Usage: WX_FIND_LIB(lib-name, [lib-function to test], [extra search paths])
dnl
dnl Tests in a variety of ways for the presence of lib-name
dnl
dnl On success, returns any novel path found in ac_find_libraries; else "std"
dnl and any cflags in ac_find_cflags
dnl On failure, ac_find_libraries will be empty
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_FIND_LIB],
[
ac_find_libraries=
dnl Try with pkg-config first. It requires its lib-name parameter lowercase
fl_pkgname=`echo "$1" | tr [[:upper:]] [[:lower:]]`
dnl suppress PKG_PROG_PKG_CONFIG output; we don't want to keep seeing it
PKG_PROG_PKG_CONFIG() AS_MESSAGE_FD> /dev/null
PKG_CHECK_MODULES([$1], [$fl_pkgname],
[
dnl Start by assuming there are no novel lib paths
ac_find_libraries="std"
dnl A simple copy of the internal vars $1_CFLAGS $1_LIBS doesn't work
dnl inside the macro
dnl
dnl TODO: When we stop being autoconf 2.61 compatible, the next 2 lines
dnl should become:
dnl AS_VAR_COPY([ac_find_cflags], [$1_CFLAGS])
dnl AS_VAR_COPY([fl_libs], [$1_LIBS])
eval ac_find_cflags=\$$1_CFLAGS
eval fl_libs=\$$1_LIBS
dnl fl_libs may now contain -Lfoopath -lfoo (only non-standard paths are
dnl added) We only want the path bit, not the lib names
for fl_path in $fl_libs
do
if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
dnl there shouldn't be >1 novel path
dnl return it without the -L, ready for WX_LINK_PATH_EXIST
ac_find_libraries=`echo "$fl_path" | cut -c 3-`
fi
done
],
[
if test "x$ac_find_libraries" = "x"; then
dnl Next with AC_CHECK_LIB, if a test function was provided
if test "x$2" != "x"; then
AC_CHECK_LIB([$1], [$2], [ac_find_libraries="std"])
fi
fi
if test "x$ac_find_libraries" = "x"; then
dnl Finally try the search path
dnl Output a message again, as AC_CHECK_LIB will just have said "no"
AC_MSG_CHECKING([elsewhere])
dnl $3 will occasionally hold extra path(s) to search
WX_PATH_FIND_LIBRARIES([$1], [$3])
if test "x$ac_find_libraries" != "x"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
fi
])
])
dnl ===========================================================================
dnl C++ features test
dnl ===========================================================================
@@ -124,7 +191,7 @@ dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
dnl or only the old <iostream.h> one - it may be generally assumed that if
dnl <iostream> exists, the other "new" headers (without .h) exist too.
dnl
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
dnl call WX_CPP_NEW_HEADERS(action-if-true, action-if-false)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_NEW_HEADERS],
@@ -287,7 +354,7 @@ AC_TRY_RUN([main () {
}], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown])
fi])
if test $ac_cv_c_bigendian = unknown; then
AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
AC_MSG_WARN([Assuming little-endian target machine - this may be overridden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
fi
if test $ac_cv_c_bigendian = yes; then
AC_DEFINE(WORDS_BIGENDIAN)

1
aclocal.m4 vendored
View File

@@ -22,6 +22,7 @@ m4_include([build/aclocal/bakefile-lang.m4])
m4_include([build/aclocal/bakefile.m4])
m4_include([build/aclocal/cppunit.m4])
m4_include([build/aclocal/gtk-2.0.m4])
m4_include([build/aclocal/gtk-3.0.m4])
m4_include([build/aclocal/gtk.m4])
m4_include([build/aclocal/pkg.m4])
m4_include([build/aclocal/sdl.m4])

22
art/first.xpm Normal file
View File

@@ -0,0 +1,22 @@
/* XPM */
static const char *const first_xpm[] = {
"16 16 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
"... . ",
"... .. ",
"... .X. ",
"... .XX........ ",
"....XXXXXXXXXX. ",
"...XXXXXXXXXXX. ",
"...XXXXXXXXXXX. ",
"....XXXXXXXXXX. ",
"... .XX........ ",
"... .X. ",
"... .. ",
"... . ",
" ",
" "};

22
art/last.xpm Normal file
View File

@@ -0,0 +1,22 @@
/* XPM */
static const char *const last_xpm[] = {
"16 16 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" . ...",
" .. ...",
" .X. ...",
" ........XX. ...",
" .XXXXXXXXXX....",
" .XXXXXXXXXXX...",
" .XXXXXXXXXXX...",
" .XXXXXXXXXX....",
" ........XX. ...",
" .X. ...",
" .. ...",
" . ...",
" ",
" "};

22
art/minus.xpm Normal file
View File

@@ -0,0 +1,22 @@
/* XPM */
static const char *const minus_xpm[] = {
"16 16 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" ",
" ",
" ",
" ",
" .............. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .............. ",
" ",
" ",
" ",
" ",
" ",
" "};

22
art/plus.xpm Normal file
View File

@@ -0,0 +1,22 @@
/* XPM */
static const char *const plus_xpm[] = {
"16 16 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" .... ",
" .XX. ",
" .XX. ",
" .XX. ",
" ......XX...... ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" ......XX...... ",
" .XX. ",
" .XX. ",
" .XX. ",
" .... ",
" ",
" "};

View File

@@ -0,0 +1,284 @@
/* application_x_executable.png - 560 bytes */
static const unsigned char application_x_executable_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x04, 0x16, 0x14, 0x07, 0x38, 0x72,
0xb9, 0xac, 0x4a, 0x00, 0x00, 0x01, 0xbd, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xb5, 0x93, 0xcd,
0x4e, 0x13, 0x61, 0x14, 0x86, 0x9f, 0xef, 0x9b,
0x6f, 0x66, 0xa4, 0x4d, 0x48, 0x28, 0x82, 0xa4,
0x60, 0x3b, 0x0d, 0x90, 0x09, 0xc6, 0x28, 0x68,
0x20, 0x61, 0xa3, 0x1b, 0x48, 0xf0, 0x06, 0xb8,
0x00, 0x37, 0x4d, 0xdc, 0xb0, 0x60, 0xe3, 0xce,
0x70, 0x01, 0x2e, 0x9a, 0xb8, 0x61, 0xc3, 0x05,
0x34, 0xde, 0x80, 0xd1, 0x95, 0x71, 0xe5, 0x42,
0xaa, 0x09, 0xda, 0x51, 0xcc, 0x0c, 0xa1, 0x69,
0x0b, 0xb4, 0xfc, 0x65, 0xfa, 0x87, 0x28, 0x2e,
0x94, 0x66, 0x14, 0x66, 0x76, 0xbc, 0xc9, 0x59,
0x3e, 0x4f, 0x4e, 0xf2, 0x9e, 0x03, 0x21, 0x59,
0x5c, 0x5a, 0x9d, 0x9c, 0x59, 0x78, 0x7a, 0xb6,
0xb8, 0xb4, 0x3a, 0x49, 0x44, 0x64, 0x18, 0xec,
0x39, 0xee, 0xfa, 0xf3, 0x67, 0x8f, 0xf1, 0x1c,
0x77, 0x3d, 0x4a, 0x22, 0xa3, 0xe0, 0x62, 0x69,
0x87, 0x89, 0x7b, 0x76, 0xa4, 0x44, 0x86, 0xc1,
0x9b, 0x95, 0x1a, 0xba, 0xd2, 0xb8, 0x33, 0x3e,
0x4c, 0x62, 0x64, 0x28, 0x54, 0x22, 0x2f, 0x5d,
0x7b, 0x77, 0x1f, 0x5d, 0x49, 0x74, 0x4d, 0x83,
0x33, 0xe8, 0x31, 0x0c, 0x2c, 0x3b, 0x73, 0xa9,
0x44, 0xfc, 0x0f, 0x97, 0xea, 0x87, 0x08, 0x04,
0x42, 0x80, 0x10, 0x82, 0x4f, 0xc5, 0x12, 0xa6,
0xa1, 0x38, 0x3d, 0xfd, 0xc9, 0x17, 0xb7, 0x8a,
0xe7, 0xb8, 0x58, 0x76, 0x66, 0x2a, 0x9f, 0xcb,
0x16, 0x00, 0x64, 0x10, 0xae, 0x1e, 0x1c, 0xa3,
0x6b, 0x1a, 0xba, 0xfa, 0x33, 0xed, 0xf6, 0x0f,
0xf8, 0x05, 0x89, 0xde, 0x38, 0xb7, 0x46, 0x93,
0x0c, 0xf7, 0xf7, 0x05, 0x37, 0x99, 0x03, 0x50,
0xe7, 0x70, 0xed, 0xb8, 0x81, 0xae, 0x34, 0x84,
0x10, 0x08, 0x04, 0x8d, 0x56, 0x87, 0xda, 0xbe,
0xcf, 0xdd, 0x89, 0x9b, 0x5c, 0x33, 0x15, 0xef,
0xde, 0x6f, 0x22, 0x11, 0xa4, 0x07, 0xfa, 0x01,
0xf0, 0x1c, 0xf7, 0x35, 0x20, 0xa4, 0x65, 0x67,
0xe6, 0x97, 0x57, 0xd6, 0xb8, 0xde, 0x1b, 0xa7,
0xd5, 0x3a, 0xc1, 0x6f, 0xb4, 0xf9, 0xee, 0xed,
0xb2, 0xb5, 0x5d, 0xa7, 0x5c, 0x39, 0xa4, 0xd9,
0xe8, 0x50, 0xae, 0x1c, 0xa1, 0xa4, 0x24, 0x66,
0x1a, 0x6c, 0xed, 0xd5, 0xf1, 0x1c, 0x97, 0xd4,
0x58, 0xea, 0x3e, 0x80, 0xcc, 0xe7, 0xb2, 0x6f,
0x2c, 0x3b, 0x33, 0xb5, 0xbc, 0xb2, 0xc6, 0xc8,
0x60, 0x1f, 0x1b, 0xc5, 0x32, 0x7b, 0x35, 0x1f,
0xdf, 0xef, 0x30, 0x96, 0x1e, 0x24, 0x95, 0x4c,
0xd0, 0x6a, 0x9e, 0x10, 0x33, 0x0d, 0x9c, 0x72,
0xb5, 0x0b, 0xbf, 0x7c, 0xf1, 0xe4, 0x43, 0xb7,
0x85, 0x7c, 0x2e, 0x5b, 0x38, 0x97, 0x3c, 0x7a,
0x78, 0x9b, 0xb8, 0x69, 0x10, 0x37, 0x0d, 0x8e,
0x0e, 0x9a, 0x48, 0x21, 0x50, 0x42, 0xf2, 0xd1,
0x2b, 0x5d, 0x80, 0xff, 0xa9, 0x31, 0x28, 0x79,
0x30, 0x3b, 0x4e, 0xcc, 0x34, 0x18, 0x4d, 0x0f,
0x60, 0xea, 0x8a, 0xb7, 0x1b, 0xdf, 0xf0, 0x1c,
0x97, 0xa4, 0x75, 0x63, 0x3a, 0x08, 0x77, 0x6b,
0x0c, 0x3b, 0xa6, 0xaf, 0xc5, 0x1d, 0x5e, 0x15,
0x3e, 0x5f, 0xa8, 0x2e, 0x52, 0x10, 0x94, 0xfc,
0xad, 0x2c, 0x14, 0x8e, 0x4c, 0xe0, 0x1b, 0xe7,
0xb8, 0xca, 0xfc, 0x06, 0x1f, 0x9b, 0xf0, 0x44,
0x52, 0x78, 0x46, 0x4d, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
/* application_x_executable.png - 1651 bytes */
static const unsigned char application_x_executable_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
0xfe, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0xcb, 0x4f, 0x13, 0x5b, 0x18, 0xff, 0xe6,
0xd1, 0x76, 0x18, 0xfa, 0x1a, 0x24, 0xd0, 0x27,
0xc5, 0xfa, 0x00, 0x05, 0x0c, 0x41, 0x51, 0x31,
0x12, 0x48, 0xbc, 0x80, 0x24, 0x46, 0x17, 0xc6,
0x95, 0x3b, 0x15, 0x5d, 0x28, 0x3e, 0x17, 0xfa,
0x27, 0xb8, 0xd1, 0xc4, 0xad, 0x3b, 0x25, 0x26,
0xba, 0x24, 0x3e, 0x89, 0x89, 0x31, 0x91, 0x47,
0x40, 0x20, 0xe1, 0x59, 0x1c, 0xc0, 0x16, 0x5b,
0xfa, 0x98, 0xd2, 0x0e, 0xa5, 0x65, 0x86, 0x3e,
0xe7, 0x2e, 0x8e, 0x93, 0xda, 0xa2, 0x01, 0xbc,
0xdc, 0xdc, 0x9b, 0xdc, 0xfb, 0x6d, 0x7e, 0x39,
0xa7, 0xa7, 0x67, 0x7e, 0xbf, 0xdf, 0xf7, 0x7d,
0x33, 0xe7, 0x00, 0xfc, 0x1f, 0xff, 0x6c, 0x60,
0xdb, 0xbd, 0xe1, 0xe1, 0xc3, 0x27, 0x4f, 0xde,
0xbb, 0x67, 0x34, 0xa2, 0x91, 0xd7, 0x9b, 0xfb,
0xab, 0xc9, 0x34, 0x34, 0xf4, 0xee, 0xdd, 0xfd,
0xfb, 0x3e, 0xdf, 0x76, 0x3d, 0x0f, 0xff, 0xbb,
0x88, 0x5f, 0xbb, 0xd6, 0xd1, 0xd1, 0xda, 0xba,
0xbc, 0x7c, 0xfa, 0xf4, 0xa9, 0x53, 0xf5, 0xf5,
0x82, 0x20, 0xcf, 0xe7, 0xae, 0xfb, 0x17, 0x08,
0xc8, 0x27, 0x7e, 0xf5, 0xea, 0x85, 0x0b, 0x2d,
0x2d, 0x3c, 0xbf, 0x73, 0xa7, 0xc9, 0x64, 0xb1,
0xe8, 0xf5, 0x4d, 0x4d, 0x07, 0x0f, 0xd6, 0xd4,
0xd0, 0x74, 0x7b, 0x7b, 0x5b, 0x5b, 0x5d, 0xdd,
0xf6, 0x0b, 0xf9, 0x6d, 0x01, 0xeb, 0x1d, 0xbf,
0x78, 0xb1, 0xa5, 0x85, 0xe7, 0xed, 0x76, 0xab,
0xd5, 0x6a, 0x65, 0x18, 0x87, 0xc3, 0xe3, 0x09,
0x04, 0x00, 0xa6, 0xa7, 0xdd, 0x6e, 0xbf, 0x1f,
0xe0, 0xd3, 0xa7, 0x89, 0x09, 0x8f, 0x87, 0xa6,
0x1b, 0x1b, 0x1b, 0x1b, 0xf7, 0xef, 0x8f, 0xc5,
0xb6, 0x4b, 0xc8, 0x96, 0x05, 0xe4, 0x13, 0xef,
0xec, 0xbc, 0x74, 0x09, 0x39, 0x6e, 0xb1, 0x58,
0xad, 0x0c, 0xc3, 0xb2, 0x5e, 0x2f, 0xc7, 0x01,
0x90, 0x24, 0x8e, 0xe3, 0x38, 0x80, 0x42, 0x41,
0x92, 0x04, 0x01, 0xd0, 0xd9, 0x79, 0xee, 0x5c,
0x73, 0x33, 0xc0, 0xd8, 0xd8, 0xdc, 0xdc, 0xd2,
0x92, 0x5a, 0x7d, 0xec, 0x58, 0x43, 0x43, 0x45,
0xc5, 0x5f, 0x17, 0xb2, 0x69, 0x01, 0xf9, 0xc4,
0xaf, 0x5f, 0xbf, 0x74, 0xa9, 0xb5, 0x95, 0xe7,
0xcb, 0xcb, 0xcd, 0x66, 0xab, 0x95, 0x61, 0xe6,
0xe7, 0xfd, 0xfe, 0xa5, 0x25, 0x00, 0x92, 0x24,
0x08, 0x82, 0x40, 0x88, 0xe3, 0xd9, 0xf1, 0x87,
0x0f, 0x23, 0x23, 0x2c, 0x0b, 0xa0, 0x52, 0x29,
0x14, 0x0a, 0x05, 0xc0, 0xfc, 0xbc, 0xcf, 0xb7,
0xba, 0xaa, 0x56, 0x9f, 0x38, 0xd1, 0xdc, 0x5c,
0x53, 0xf3, 0xfb, 0x42, 0x36, 0x14, 0x90, 0x4f,
0xfc, 0xc6, 0x8d, 0x8e, 0x8e, 0xb6, 0x36, 0x9e,
0xb7, 0xd9, 0xcc, 0x66, 0x8b, 0x85, 0x61, 0x5c,
0x2e, 0x8e, 0x0b, 0x87, 0xb3, 0x8e, 0xcb, 0x48,
0x10, 0xb2, 0x00, 0x34, 0x3e, 0x79, 0xf2, 0xe8,
0xd1, 0x7d, 0xfb, 0x90, 0x00, 0x92, 0xcc, 0xa2,
0x5a, 0xad, 0xd5, 0xea, 0xf5, 0x6a, 0xf5, 0xf5,
0xeb, 0x1d, 0x1d, 0xed, 0xed, 0xa2, 0xb8, 0x55,
0x21, 0xf8, 0x66, 0x89, 0xdf, 0xbc, 0x79, 0xf9,
0x72, 0x5b, 0x1b, 0xcf, 0x97, 0x95, 0x99, 0x4c,
0x66, 0x33, 0xc3, 0xb8, 0xdd, 0x4b, 0x4b, 0xcb,
0xcb, 0xeb, 0x9d, 0xce, 0x1f, 0xe3, 0x38, 0x86,
0x61, 0x18, 0xc0, 0x8b, 0x17, 0xef, 0xde, 0x8d,
0x8c, 0x00, 0x34, 0x34, 0xd4, 0xd6, 0xda, 0xed,
0x00, 0xfb, 0xf6, 0xed, 0xda, 0x65, 0x34, 0x02,
0xc4, 0xe3, 0xc9, 0x64, 0x2a, 0x05, 0x60, 0xb1,
0x18, 0x0c, 0xa5, 0xa5, 0x05, 0x05, 0x7f, 0xfc,
0xd1, 0xd4, 0x54, 0x53, 0x13, 0x8d, 0x6e, 0x56,
0x08, 0xbe, 0x11, 0xf1, 0x5b, 0xb7, 0xae, 0x5c,
0x69, 0x6b, 0xe3, 0x79, 0xab, 0xd5, 0x68, 0x34,
0x9b, 0x19, 0xc6, 0xeb, 0x0d, 0x87, 0x23, 0x91,
0x1f, 0x89, 0xe6, 0x3a, 0x9e, 0xef, 0x7c, 0x69,
0xa9, 0x5e, 0xaf, 0x56, 0x03, 0x30, 0x8c, 0x56,
0x4b, 0xd3, 0x00, 0x92, 0x94, 0xc9, 0x48, 0x12,
0xc0, 0xa1, 0x43, 0x55, 0x55, 0x36, 0x1b, 0x80,
0xc1, 0xb0, 0x63, 0x87, 0x4e, 0x07, 0xf0, 0xfc,
0xf9, 0x9b, 0x37, 0xc3, 0xc3, 0x00, 0x3c, 0x1f,
0x8b, 0x49, 0x92, 0x46, 0x53, 0x5b, 0x5b, 0x55,
0x55, 0x56, 0x16, 0x89, 0x6c, 0x24, 0xe4, 0x17,
0x19, 0xf0, 0x7a, 0xcf, 0x9f, 0x3f, 0x73, 0xa6,
0xae, 0x2e, 0x12, 0xb1, 0x58, 0x0c, 0x06, 0xb3,
0x99, 0x61, 0x02, 0x81, 0xe5, 0xe5, 0x68, 0xf4,
0x47, 0xa7, 0xe5, 0x92, 0xc9, 0x1f, 0xe3, 0xf8,
0x8f, 0x99, 0x78, 0xff, 0xbe, 0xb7, 0xd7, 0xe1,
0x00, 0x30, 0x1a, 0x8b, 0x8b, 0x75, 0x3a, 0x80,
0x92, 0x92, 0xa2, 0x22, 0x8d, 0x06, 0x40, 0x92,
0x52, 0xa9, 0x4c, 0x06, 0xc0, 0xe1, 0x60, 0x59,
0x9f, 0x0f, 0x40, 0xa5, 0x22, 0x49, 0x92, 0x04,
0xa0, 0x28, 0xd4, 0x23, 0x6a, 0xb5, 0x56, 0x5b,
0x5c, 0xac, 0xd3, 0xd9, 0x6c, 0x25, 0x25, 0x4a,
0x65, 0xb6, 0xb4, 0xf2, 0x99, 0x92, 0x3f, 0x17,
0x60, 0x32, 0x3d, 0x7b, 0xd6, 0xdd, 0x3d, 0x3a,
0xea, 0xf5, 0xa6, 0x52, 0x18, 0x46, 0x51, 0xf1,
0x78, 0x75, 0x75, 0x65, 0xa5, 0xdd, 0xae, 0x52,
0x11, 0x04, 0x8e, 0x63, 0x18, 0x80, 0x20, 0xc4,
0xe3, 0xa9, 0x14, 0x00, 0x2a, 0x10, 0x14, 0x18,
0x06, 0x40, 0xd3, 0x4a, 0x25, 0x41, 0x00, 0xb8,
0x5c, 0x8b, 0x8b, 0xe1, 0x30, 0x40, 0x2a, 0x95,
0x4e, 0x67, 0x32, 0x00, 0xf5, 0xf5, 0xd5, 0xd5,
0x65, 0x65, 0x00, 0xab, 0xab, 0xf1, 0x78, 0x32,
0x09, 0xd0, 0xd7, 0xf7, 0xf9, 0xf3, 0xdc, 0x1c,
0x00, 0x45, 0x29, 0x95, 0x24, 0x99, 0x2d, 0x35,
0x19, 0x03, 0x01, 0xaf, 0xd7, 0xe9, 0x94, 0xa4,
0x85, 0x05, 0x8e, 0x4b, 0x24, 0x0a, 0x0a, 0x90,
0xe4, 0x23, 0x47, 0xf2, 0x99, 0x12, 0xf9, 0x13,
0x8b, 0x8b, 0x73, 0x73, 0xbd, 0xbd, 0xb1, 0x98,
0xd9, 0xbc, 0x7b, 0xf7, 0xf1, 0xe3, 0x8f, 0x1f,
0x4f, 0x4d, 0xcd, 0xcc, 0xb8, 0xdd, 0x77, 0xef,
0x86, 0x42, 0xe1, 0x70, 0x38, 0x2c, 0x08, 0x76,
0xbb, 0xcd, 0x66, 0xb1, 0x28, 0x14, 0x2c, 0xeb,
0x74, 0x72, 0x1c, 0x80, 0xd5, 0x6a, 0x30, 0xe8,
0xf5, 0x00, 0x0b, 0x0b, 0x6e, 0x77, 0x28, 0x04,
0x90, 0x4a, 0x21, 0x67, 0x27, 0x26, 0xbe, 0x7c,
0xf1, 0x7a, 0x01, 0x94, 0x4a, 0xe4, 0xac, 0x56,
0xab, 0xd1, 0x20, 0x1a, 0x99, 0x0c, 0x00, 0x40,
0x20, 0x10, 0x0c, 0x46, 0xa3, 0x00, 0x0a, 0x05,
0xca, 0xa0, 0x8c, 0x1c, 0xe7, 0xf7, 0xbb, 0x5c,
0x92, 0x34, 0x3e, 0xce, 0xb2, 0xc1, 0x20, 0x86,
0x61, 0x98, 0x24, 0x25, 0x12, 0x3b, 0x77, 0x0e,
0x0d, 0xf5, 0xf4, 0x3c, 0x78, 0x30, 0x35, 0x95,
0xcf, 0x77, 0xc3, 0xb3, 0x50, 0x7e, 0x4f, 0x54,
0x57, 0xef, 0xdd, 0x6b, 0x30, 0x08, 0x42, 0x43,
0xc3, 0x91, 0x23, 0x75, 0x75, 0x34, 0x3d, 0x3f,
0xbf, 0xb0, 0xb0, 0xb4, 0x84, 0xdc, 0x07, 0x00,
0xc0, 0x71, 0x94, 0xa1, 0x82, 0x02, 0x8a, 0x52,
0x2a, 0x01, 0x1a, 0x1a, 0x0e, 0x1d, 0xb2, 0xdb,
0xb3, 0xce, 0x8e, 0x8d, 0x4d, 0x4d, 0x79, 0x3c,
0x00, 0xd1, 0x68, 0x2c, 0xb6, 0xb6, 0x96, 0x9d,
0xf7, 0xf9, 0x16, 0x17, 0xbf, 0x7e, 0x95, 0xa4,
0xa1, 0xa1, 0xc9, 0xc9, 0xc5, 0xc5, 0x2c, 0xf1,
0xc1, 0xc1, 0x9e, 0x9e, 0x87, 0x0f, 0x5d, 0xae,
0x4d, 0x37, 0x71, 0x7e, 0xe4, 0x1e, 0xbe, 0x4c,
0xa6, 0xc9, 0x49, 0x96, 0xf5, 0xfb, 0x69, 0x7a,
0x68, 0x68, 0x70, 0x70, 0x78, 0x58, 0x10, 0x2a,
0x2b, 0xed, 0xf6, 0xd2, 0xd2, 0xf5, 0xaf, 0x47,
0x00, 0xd4, 0xac, 0x33, 0x33, 0x2c, 0xeb, 0xf7,
0x67, 0x7b, 0x24, 0x93, 0x41, 0x19, 0xa2, 0x28,
0xb4, 0x8e, 0xe3, 0x7c, 0x3e, 0xa7, 0x73, 0xeb,
0xc4, 0x37, 0x2d, 0xe0, 0x57, 0x42, 0xc6, 0xc6,
0x58, 0x96, 0xe3, 0x68, 0x7a, 0x70, 0x70, 0x60,
0x60, 0x70, 0x50, 0x10, 0xf6, 0xec, 0x29, 0x2f,
0x2f, 0x29, 0xc9, 0x36, 0x61, 0x61, 0x21, 0x45,
0xa9, 0x54, 0x00, 0x56, 0xab, 0xd1, 0xc8, 0x30,
0xd9, 0x66, 0x57, 0xab, 0x69, 0x9a, 0xa2, 0x00,
0x38, 0x0e, 0xd5, 0xf8, 0xc0, 0xc0, 0xf8, 0xb8,
0xc7, 0xb3, 0x75, 0xe2, 0xbf, 0xec, 0x81, 0x8d,
0x02, 0xf5, 0x88, 0x20, 0x14, 0x16, 0xea, 0x74,
0x46, 0x63, 0x57, 0x17, 0xcf, 0x8b, 0xa2, 0x4a,
0x75, 0xe7, 0x4e, 0x3a, 0x2d, 0x08, 0xa1, 0x90,
0x28, 0xd6, 0xd6, 0x1e, 0x38, 0x50, 0x59, 0xa9,
0x50, 0xa4, 0x52, 0xc9, 0x64, 0x3a, 0x8d, 0x6a,
0x9f, 0xa6, 0x01, 0x34, 0x1a, 0xb5, 0x9a, 0xa2,
0x00, 0x1c, 0x8e, 0xe9, 0xe9, 0xc9, 0x49, 0x49,
0x7a, 0xfb, 0xb6, 0xbf, 0x7f, 0x76, 0x16, 0xc3,
0xc2, 0x61, 0xaf, 0x77, 0x7c, 0xfc, 0xe0, 0xc1,
0x89, 0x89, 0xfe, 0xfe, 0xa7, 0x4f, 0x3d, 0x1e,
0xf4, 0x14, 0x49, 0x42, 0x88, 0xfa, 0x65, 0x1b,
0x05, 0x68, 0x34, 0x08, 0x8b, 0x8a, 0x42, 0x21,
0x9f, 0x6f, 0x7a, 0x5a, 0xa9, 0x8c, 0xc7, 0x45,
0x31, 0x12, 0xe9, 0xee, 0x16, 0x45, 0x82, 0x30,
0x9b, 0x2f, 0x5e, 0x4c, 0xa7, 0x57, 0x57, 0x83,
0xc1, 0xb5, 0xb5, 0xea, 0xea, 0xaa, 0xaa, 0x8a,
0x0a, 0x92, 0x94, 0x9b, 0xf6, 0xdb, 0x37, 0xa7,
0x73, 0x6e, 0x0e, 0xa0, 0xab, 0xeb, 0xe5, 0xcb,
0x91, 0x11, 0x0c, 0x73, 0xb9, 0x26, 0x27, 0x5f,
0xbf, 0x3e, 0x7b, 0xd6, 0xed, 0x9e, 0x9d, 0xed,
0xeb, 0xe3, 0x79, 0xb4, 0x6f, 0x41, 0x01, 0x42,
0x95, 0xea, 0x3b, 0xbd, 0xef, 0xfc, 0xd2, 0xe9,
0x5f, 0x09, 0xda, 0xa4, 0x80, 0xc2, 0x42, 0x84,
0x5a, 0x2d, 0x42, 0xbd, 0x1e, 0x21, 0xc3, 0x08,
0x42, 0x34, 0xca, 0x71, 0x14, 0xb5, 0xb2, 0x12,
0x0e, 0x7f, 0xfb, 0xf6, 0xf1, 0x63, 0x3c, 0xae,
0x52, 0xed, 0xda, 0x75, 0xf6, 0x6c, 0x32, 0x19,
0x8d, 0xfa, 0x7c, 0x89, 0x44, 0x32, 0x99, 0x48,
0x88, 0x22, 0x41, 0x74, 0x75, 0xbd, 0x7a, 0x35,
0x3a, 0x0a, 0xf0, 0xe5, 0xcb, 0xf0, 0xf0, 0xf3,
0xe7, 0xb7, 0x6f, 0x87, 0xc3, 0x7e, 0x3f, 0xcb,
0xca, 0x5f, 0x5c, 0x99, 0x30, 0xf9, 0xfd, 0xb5,
0x8e, 0xe7, 0x95, 0xb6, 0x4c, 0x7c, 0x6d, 0xed,
0x37, 0x05, 0xc8, 0x1b, 0xcb, 0x0e, 0xd1, 0x74,
0x2e, 0x6a, 0x34, 0x89, 0x84, 0x28, 0x46, 0x22,
0x2a, 0x95, 0x28, 0xc6, 0x62, 0xa1, 0x10, 0xcb,
0x8a, 0xa2, 0x42, 0x61, 0xb3, 0x35, 0x35, 0x39,
0x1c, 0x4e, 0x67, 0x30, 0x08, 0x30, 0x3d, 0x3d,
0x30, 0xf0, 0xe4, 0xc9, 0xa3, 0x47, 0xd1, 0x28,
0xcf, 0x7b, 0x3c, 0x2b, 0x2b, 0xe8, 0x7f, 0x72,
0xa9, 0xc8, 0x0e, 0x27, 0x12, 0x08, 0xe3, 0xf1,
0x5c, 0xc2, 0xf2, 0x87, 0x4c, 0x9e, 0xcf, 0xc6,
0x16, 0xaf, 0x94, 0xb2, 0x53, 0x72, 0x06, 0xf2,
0x51, 0xa7, 0x93, 0x05, 0xe5, 0x66, 0x4e, 0xa1,
0xc8, 0x75, 0x52, 0xbe, 0xd8, 0xc8, 0x19, 0x90,
0x05, 0x2d, 0x2f, 0xff, 0x1c, 0xe5, 0xd3, 0xea,
0xfa, 0xd8, 0xa6, 0x3b, 0x71, 0x7e, 0x66, 0x28,
0x0a, 0xa1, 0x52, 0x89, 0x50, 0x2e, 0x09, 0xd9,
0xf1, 0x64, 0x32, 0xd7, 0x51, 0x59, 0xd0, 0xea,
0x6a, 0xee, 0xba, 0xff, 0x40, 0xfc, 0x09, 0xee,
0x21, 0x14, 0xa1, 0xa0, 0xa8, 0x66, 0xdb, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};

262
art/tango/dialog_error.h Normal file
View File

@@ -0,0 +1,262 @@
/* dialog_error.png - 653 bytes */
static const unsigned char dialog_error_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0b, 0x0a, 0x09, 0x32, 0x0e, 0x93,
0x53, 0xb4, 0xb0, 0x00, 0x00, 0x02, 0x1a, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x93, 0xbd,
0x4f, 0x93, 0x51, 0x14, 0xc6, 0x7f, 0xf7, 0x6d,
0x0b, 0xe5, 0xa3, 0xbe, 0xa0, 0xc4, 0x1a, 0x4d,
0xa0, 0x68, 0x9b, 0x02, 0xb6, 0x0b, 0xc4, 0x94,
0x44, 0x87, 0x8e, 0xba, 0x32, 0x69, 0xd2, 0x81,
0x11, 0xfe, 0x22, 0x3b, 0x32, 0x74, 0x66, 0x23,
0xb2, 0x90, 0x40, 0x58, 0x44, 0x07, 0x30, 0x92,
0x16, 0x9a, 0x68, 0x63, 0xf8, 0xb0, 0x24, 0xa4,
0x2d, 0x4d, 0x5b, 0x28, 0xf6, 0x3d, 0xc7, 0xe1,
0x7d, 0x4b, 0x10, 0x89, 0x1a, 0x4f, 0x72, 0x73,
0x93, 0x9b, 0xf3, 0xfc, 0x9e, 0xe4, 0x39, 0xf7,
0x18, 0x6e, 0x54, 0x0e, 0x52, 0xc0, 0x3c, 0x90,
0x06, 0xc6, 0xbd, 0xe7, 0x12, 0xb0, 0x0e, 0x2c,
0x65, 0x60, 0xeb, 0x7a, 0xbf, 0xb9, 0x21, 0x7e,
0x3b, 0x1c, 0x0a, 0x2d, 0x4c, 0x26, 0x93, 0x04,
0xc3, 0x61, 0x7c, 0x03, 0x03, 0xa8, 0x2a, 0x9d,
0xb3, 0x33, 0xce, 0xcb, 0x65, 0x8a, 0x85, 0x02,
0xd5, 0x66, 0x33, 0x9b, 0x81, 0xc5, 0xdf, 0x00,
0x39, 0x78, 0x37, 0x9d, 0x4c, 0xbe, 0x1c, 0x99,
0x99, 0xe1, 0x72, 0x7b, 0x1b, 0xe7, 0xf4, 0x14,
0x1c, 0x07, 0x55, 0x45, 0x0c, 0x58, 0x43, 0x77,
0xf1, 0x4f, 0x4d, 0x52, 0xdd, 0xdd, 0xe5, 0x53,
0xb1, 0xb8, 0x9a, 0x81, 0x57, 0x00, 0xbe, 0xae,
0xf3, 0x74, 0x32, 0xf9, 0xfa, 0x5e, 0x2c, 0x46,
0x7b, 0x73, 0x13, 0x6d, 0x34, 0x40, 0x04, 0x55,
0x41, 0x45, 0x41, 0x04, 0x69, 0xb6, 0xe8, 0x1c,
0x7c, 0xa3, 0x3f, 0x16, 0xc3, 0xb6, 0xac, 0xe8,
0x8b, 0x6a, 0xf5, 0xc1, 0x32, 0xac, 0x98, 0x1c,
0xa4, 0x86, 0x43, 0xa1, 0xf7, 0xcf, 0xe6, 0xe6,
0xb8, 0x58, 0x5b, 0x43, 0x9d, 0x0e, 0xaa, 0x8a,
0x2a, 0xa8, 0x7a, 0x62, 0x05, 0xc5, 0x85, 0xa9,
0x31, 0x04, 0x53, 0x29, 0x3e, 0x6f, 0x6c, 0x50,
0x6b, 0xb5, 0x66, 0x2d, 0x60, 0x7e, 0x32, 0x91,
0xe0, 0x72, 0x67, 0x07, 0x75, 0x1c, 0x10, 0x50,
0x01, 0x15, 0x71, 0x0f, 0xea, 0x81, 0x14, 0x54,
0xc1, 0x71, 0xb8, 0xc8, 0xe7, 0x79, 0x3c, 0x16,
0x01, 0x98, 0xf7, 0x03, 0xe9, 0x60, 0xf8, 0x3e,
0x3f, 0x3e, 0x7c, 0x44, 0x45, 0x19, 0x2b, 0x7f,
0xe7, 0x4f, 0xb5, 0x6f, 0xdf, 0x41, 0xaa, 0x35,
0x02, 0x0f, 0x1f, 0x01, 0xa4, 0xfd, 0xc0, 0xb8,
0xd5, 0x3f, 0x88, 0x8a, 0x1b, 0xd8, 0xdf, 0x4a,
0x44, 0x51, 0xed, 0x60, 0x7a, 0x02, 0x00, 0xe3,
0x16, 0x70, 0x95, 0xf6, 0xbf, 0x00, 0xf0, 0xfa,
0x54, 0x05, 0x00, 0x3f, 0x50, 0xea, 0xd4, 0xcf,
0x26, 0x14, 0x83, 0xaa, 0xc3, 0x97, 0x91, 0x11,
0xb7, 0x41, 0xc4, 0xbd, 0x51, 0x37, 0x3c, 0x37,
0x55, 0x44, 0xdd, 0x20, 0xb5, 0xd9, 0x02, 0x28,
0x59, 0xc0, 0xfa, 0xf9, 0xc9, 0x09, 0xc6, 0x1e,
0xba, 0x22, 0xff, 0x22, 0xee, 0x3a, 0x8a, 0x27,
0x56, 0xc1, 0x1a, 0x1c, 0xa4, 0x5d, 0xab, 0x01,
0xac, 0x5b, 0xc0, 0xd2, 0xfe, 0xde, 0x1e, 0x81,
0x78, 0xdc, 0x25, 0xcb, 0x75, 0x91, 0x37, 0x3a,
0xed, 0x4e, 0x43, 0x50, 0x63, 0xf0, 0x47, 0x22,
0x94, 0x0e, 0x0f, 0x01, 0x96, 0xac, 0x0c, 0x6c,
0xd5, 0x5a, 0xad, 0x6c, 0xa5, 0x90, 0xa7, 0x67,
0xea, 0xa9, 0x0b, 0xb9, 0xe6, 0x8a, 0x77, 0xab,
0x28, 0x18, 0x43, 0x4f, 0x34, 0x46, 0xe3, 0xe0,
0x80, 0x7a, 0xbb, 0x9d, 0xcd, 0xc0, 0x96, 0x0f,
0x60, 0x19, 0x56, 0x9e, 0x57, 0x2a, 0xb3, 0xb6,
0xcf, 0x17, 0x1d, 0x48, 0x24, 0x70, 0x1a, 0x0d,
0xe4, 0xa2, 0x7d, 0xf5, 0x13, 0x15, 0x30, 0x76,
0x88, 0xde, 0xf8, 0x04, 0x8d, 0x72, 0x99, 0xc2,
0xf1, 0xf1, 0x6a, 0x06, 0xde, 0xdc, 0xba, 0x4c,
0x76, 0x5f, 0xdf, 0xc2, 0x93, 0xd1, 0x51, 0x02,
0xb6, 0x8d, 0xe9, 0xed, 0x45, 0x45, 0x70, 0x9a,
0x4d, 0x3a, 0xf5, 0x3a, 0x5f, 0x8f, 0x8e, 0xba,
0xce, 0x8b, 0xb7, 0x6e, 0xe3, 0xff, 0xac, 0xf3,
0x4f, 0xc2, 0x47, 0x66, 0x1e, 0xb9, 0x58, 0x76,
0x77, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};
/* dialog_error.png - 1390 bytes */
static const unsigned char dialog_error_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
0xf9, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x56, 0x4d, 0x68, 0x13, 0x5b, 0x18, 0x3d, 0xe9,
0xcc, 0x64, 0xf2, 0x53, 0x79, 0xb6, 0x09, 0x09,
0x9d, 0x48, 0x13, 0xfc, 0x2b, 0x0a, 0xa5, 0xb8,
0xaa, 0x5d, 0x28, 0x82, 0x8b, 0xa2, 0xd9, 0x77,
0x25, 0x75, 0xe5, 0xa6, 0x0b, 0x97, 0x42, 0x41,
0x41, 0x50, 0x70, 0xe1, 0xde, 0x4a, 0xdd, 0xea,
0xd6, 0x85, 0x60, 0x37, 0x76, 0xd7, 0x85, 0x20,
0x28, 0xa5, 0x4d, 0xdb, 0x40, 0x23, 0x49, 0x85,
0xa4, 0x53, 0x9a, 0xa4, 0x9d, 0xc4, 0xcc, 0x4c,
0x9a, 0xc9, 0xbd, 0x6f, 0xf1, 0x79, 0xdf, 0x24,
0xd3, 0x57, 0xe3, 0xab, 0xbe, 0xb7, 0x78, 0xf8,
0x2d, 0x72, 0xb8, 0x73, 0x73, 0xef, 0x77, 0xce,
0xfd, 0x7e, 0xee, 0x05, 0x7e, 0xdb, 0x6f, 0xfb,
0x29, 0xf3, 0x1d, 0x77, 0xe1, 0xcb, 0x97, 0x00,
0x10, 0x0a, 0xd1, 0x68, 0x66, 0x86, 0x30, 0x9d,
0x26, 0x1c, 0x1d, 0x25, 0x1c, 0x18, 0x20, 0xdc,
0xdb, 0x23, 0x5c, 0x5d, 0x25, 0x7c, 0xfb, 0x96,
0xf0, 0xd9, 0xb3, 0x5b, 0xb7, 0x00, 0xc0, 0x34,
0xff, 0x33, 0x01, 0x44, 0xfc, 0xce, 0x1d, 0x1a,
0x3d, 0x79, 0x72, 0xf6, 0xec, 0xd8, 0xd8, 0xd8,
0x58, 0x24, 0xa2, 0x69, 0x23, 0x23, 0x23, 0x23,
0x40, 0x7f, 0x7f, 0x34, 0x1a, 0x8d, 0x02, 0xb2,
0xac, 0x28, 0xb2, 0x0c, 0xb4, 0x5a, 0x96, 0x65,
0x59, 0x80, 0x61, 0xe8, 0xfa, 0xce, 0x0e, 0xb0,
0xbd, 0x9d, 0xcb, 0xe5, 0x72, 0x40, 0x3e, 0xbf,
0xbe, 0xbe, 0xbe, 0x5e, 0xa9, 0xd0, 0x3e, 0xb3,
0xb3, 0x24, 0xe4, 0xc5, 0x8b, 0x7f, 0x4d, 0x00,
0x11, 0x7f, 0xf4, 0x68, 0x70, 0x30, 0x1e, 0x8f,
0xc7, 0xef, 0xdf, 0xbf, 0x74, 0x69, 0x72, 0x72,
0x72, 0x12, 0x08, 0x85, 0x0c, 0xc3, 0x30, 0x80,
0x76, 0x7b, 0x6b, 0x6b, 0x6b, 0x0b, 0xe0, 0xdc,
0xb2, 0x4c, 0x13, 0xe0, 0x9c, 0x31, 0xce, 0x01,
0xce, 0x39, 0xe7, 0x1c, 0x60, 0x4c, 0x51, 0x14,
0x05, 0xe8, 0xeb, 0x4b, 0x24, 0x12, 0x09, 0xc0,
0x34, 0xc3, 0xe1, 0x70, 0x18, 0x58, 0x59, 0x59,
0x5a, 0x5a, 0x5a, 0x02, 0x0c, 0xa3, 0x5a, 0xad,
0x56, 0x1f, 0x3f, 0x26, 0x21, 0x0f, 0x1e, 0xfc,
0x28, 0x2f, 0xe9, 0x47, 0x4f, 0x9c, 0x88, 0x3f,
0x7d, 0x3a, 0x31, 0x31, 0x35, 0x35, 0x35, 0x05,
0xc8, 0xf2, 0xf2, 0xf2, 0xf2, 0x32, 0xc0, 0x58,
0xb1, 0x58, 0x2a, 0x01, 0x9c, 0xb7, 0x5a, 0x07,
0x07, 0x2e, 0x61, 0x21, 0x80, 0x31, 0xce, 0x19,
0x03, 0x38, 0x77, 0x1c, 0xc7, 0x01, 0x18, 0xab,
0x56, 0x2b, 0x15, 0x40, 0x92, 0x48, 0xb8, 0xa6,
0x4d, 0x4c, 0x4c, 0x4c, 0x00, 0xd5, 0x6a, 0xb1,
0x58, 0x2c, 0x5e, 0xbd, 0x9a, 0x4e, 0xdb, 0xb6,
0x6d, 0x97, 0x4a, 0xaf, 0x5f, 0x03, 0xc0, 0xa7,
0x4f, 0xc7, 0x8e, 0x40, 0x77, 0x8e, 0x7f, 0xf9,
0x72, 0xfd, 0xfa, 0xf4, 0xf4, 0xf4, 0x74, 0x24,
0x12, 0x08, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x8c,
0xd5, 0xeb, 0xf5, 0x3a, 0x11, 0x65, 0x0c, 0x20,
0xaa, 0x9d, 0x84, 0xc5, 0xc9, 0x8b, 0x31, 0xcd,
0xd3, 0x0c, 0xfd, 0xd2, 0xf7, 0x40, 0x20, 0x18,
0x04, 0x9a, 0xcd, 0x64, 0x32, 0x95, 0x02, 0xde,
0xbf, 0x5f, 0x5c, 0x7c, 0xf7, 0x4e, 0xa4, 0xd6,
0xf0, 0x70, 0xaf, 0x1a, 0xe9, 0xfb, 0xbe, 0xbe,
0x99, 0x19, 0x91, 0xe3, 0xa1, 0x90, 0x61, 0xec,
0xef, 0x03, 0x9c, 0xd7, 0x6a, 0xb5, 0x9a, 0x4b,
0x5c, 0x10, 0x11, 0x44, 0x19, 0x13, 0xc4, 0xbb,
0x85, 0x09, 0xe2, 0xe2, 0x3b, 0x63, 0x42, 0x70,
0xa3, 0xd1, 0x68, 0x00, 0x81, 0x40, 0xbd, 0x6e,
0x18, 0xc0, 0xa9, 0x53, 0xa9, 0x54, 0x2a, 0x15,
0x89, 0x08, 0xff, 0xbd, 0x22, 0xd0, 0x43, 0x40,
0x3a, 0x3d, 0x34, 0x74, 0xee, 0xdc, 0xf9, 0xf3,
0x40, 0xbb, 0x9d, 0xcf, 0x17, 0x0a, 0x2e, 0x41,
0xf7, 0x04, 0xdb, 0xed, 0xce, 0x5c, 0x17, 0xe8,
0x12, 0x16, 0xc2, 0x84, 0x60, 0x51, 0x1b, 0x2e,
0x32, 0x06, 0x1c, 0x1c, 0x50, 0x2a, 0xc6, 0x62,
0x9a, 0x36, 0x34, 0xe4, 0xfa, 0xef, 0x25, 0x40,
0xfe, 0xfe, 0xf4, 0xe8, 0x68, 0x7f, 0x7f, 0x34,
0x1a, 0x89, 0x00, 0x8c, 0xad, 0xac, 0xd8, 0xb6,
0xeb, 0x30, 0x1a, 0xdd, 0xdc, 0xdc, 0xdc, 0xec,
0xb5, 0x7d, 0x6f, 0x2b, 0x14, 0xe2, 0xf1, 0x78,
0x1c, 0xe0, 0xbc, 0xd9, 0x6c, 0x36, 0x81, 0x50,
0x28, 0x1c, 0x3e, 0x71, 0xc2, 0xf5, 0xff, 0x93,
0x11, 0x18, 0x18, 0x90, 0x65, 0x59, 0x96, 0xe5,
0xc3, 0xa1, 0xff, 0x55, 0xe6, 0x8d, 0x9c, 0x24,
0x49, 0x52, 0xdf, 0x5f, 0xac, 0xc4, 0x3d, 0x72,
0x6c, 0x01, 0x7b, 0x7b, 0xad, 0x96, 0x6d, 0x8b,
0x93, 0xef, 0x4c, 0x9d, 0x5f, 0x65, 0x6e, 0x2d,
0x88, 0x54, 0x22, 0x7f, 0xc2, 0x7f, 0xaf, 0xf5,
0x3d, 0x52, 0x68, 0x75, 0xb5, 0x56, 0xd3, 0x75,
0x5d, 0xbf, 0x76, 0x2d, 0x14, 0xf2, 0xfb, 0x29,
0x12, 0xe4, 0x60, 0x7b, 0x3b, 0x99, 0x4c, 0x26,
0x5d, 0x02, 0x6e, 0x4d, 0x88, 0x31, 0xf0, 0x77,
0x39, 0x7f, 0xb8, 0x86, 0xc4, 0x58, 0x92, 0x24,
0x09, 0xf8, 0xfa, 0x75, 0x7f, 0x7f, 0x7f, 0xdf,
0xf5, 0x7f, 0xec, 0x08, 0xd0, 0x29, 0x2f, 0x2c,
0x94, 0x4a, 0x74, 0x73, 0xfa, 0x7c, 0x9a, 0x96,
0x48, 0x74, 0x12, 0x71, 0xbb, 0x4b, 0x67, 0x37,
0x72, 0xbb, 0x92, 0x97, 0xb0, 0x10, 0xe4, 0xfd,
0x3f, 0x9d, 0xbc, 0x24, 0xd1, 0x0d, 0xbe, 0xbb,
0xab, 0xeb, 0xdb, 0xdb, 0xae, 0x7f, 0x62, 0xe3,
0xf3, 0xfd, 0x43, 0x01, 0x3e, 0x5f, 0xa9, 0x04,
0x00, 0x73, 0x73, 0x85, 0x42, 0x36, 0x9b, 0xcd,
0x56, 0x2a, 0xa6, 0x19, 0x0c, 0x06, 0x83, 0x00,
0x40, 0xc8, 0x39, 0xe7, 0xed, 0x76, 0x67, 0x6d,
0xb8, 0x5d, 0xa7, 0x3b, 0xd5, 0xdc, 0xda, 0xe9,
0x14, 0xe6, 0x46, 0x46, 0x55, 0x55, 0x15, 0x30,
0xcd, 0x40, 0x20, 0x10, 0x00, 0x74, 0x5d, 0xd7,
0x77, 0x76, 0x2a, 0x95, 0x5c, 0x0e, 0x00, 0x9e,
0x3f, 0xef, 0x16, 0x70, 0x58, 0x88, 0xe4, 0x25,
0xfe, 0x4d, 0x57, 0xdf, 0xe2, 0x22, 0x9d, 0xee,
0xcd, 0x9b, 0x00, 0x60, 0x18, 0xa6, 0x59, 0x2e,
0x97, 0xcb, 0xe9, 0xf4, 0xd0, 0xd0, 0xf8, 0xf8,
0xf8, 0x38, 0xc0, 0xd8, 0xee, 0x6e, 0xa5, 0xd2,
0x7d, 0x03, 0x77, 0xa7, 0x84, 0x97, 0x68, 0x77,
0xb1, 0xfa, 0x7c, 0xaa, 0xea, 0xf7, 0x03, 0x7d,
0x7d, 0xa7, 0x4f, 0x9f, 0x39, 0x03, 0x64, 0xb3,
0x6b, 0x6b, 0x99, 0x0c, 0x50, 0xa9, 0xb4, 0x5a,
0x8e, 0x33, 0x3b, 0x7b, 0xef, 0x1e, 0x00, 0x7c,
0xfc, 0x48, 0x7c, 0x44, 0xdb, 0x38, 0xdc, 0x3e,
0x3c, 0x02, 0x44, 0xfd, 0x4b, 0xdf, 0xbe, 0xfb,
0xfd, 0x6f, 0xde, 0x00, 0xc0, 0xc6, 0xc6, 0x95,
0x2b, 0xb6, 0x6d, 0xdb, 0xaa, 0xda, 0x68, 0x94,
0x4a, 0xa5, 0xd2, 0xe5, 0xcb, 0x03, 0x03, 0x17,
0x2f, 0x5e, 0xb8, 0x00, 0x28, 0x0a, 0x9d, 0x5c,
0xbb, 0xdd, 0x68, 0xd0, 0x1b, 0xc8, 0x71, 0x5a,
0xad, 0xee, 0xda, 0x20, 0x94, 0x65, 0x49, 0x02,
0x64, 0x39, 0x16, 0x8b, 0xc5, 0x00, 0xdb, 0x1e,
0x1c, 0x1c, 0x1c, 0x04, 0xb2, 0xd9, 0x4c, 0x26,
0x93, 0x01, 0x0a, 0x05, 0xcb, 0xb2, 0xac, 0xb9,
0xb9, 0xbb, 0x77, 0x01, 0x60, 0x7e, 0xbe, 0x9b,
0xb0, 0x68, 0x1b, 0x87, 0x85, 0x1c, 0x11, 0x01,
0x57, 0x00, 0x61, 0x30, 0x48, 0x0f, 0xe0, 0x4c,
0x26, 0x99, 0x6c, 0x36, 0x9b, 0x4d, 0xd3, 0xb4,
0xac, 0x7c, 0x3e, 0x9f, 0x1f, 0x1d, 0x65, 0x4c,
0x96, 0x65, 0x59, 0x55, 0xfd, 0xfe, 0x44, 0x42,
0xd3, 0x00, 0x55, 0xa5, 0xe2, 0x56, 0x14, 0xaa,
0x19, 0xc6, 0xe8, 0x1e, 0xb1, 0x2c, 0x59, 0x56,
0x14, 0xa0, 0x58, 0x2c, 0x97, 0xcb, 0x65, 0x20,
0x9b, 0xcd, 0xe5, 0x72, 0xb9, 0x7a, 0xfd, 0xc3,
0x07, 0xc7, 0x71, 0x9c, 0xf9, 0xf9, 0x87, 0x0f,
0x01, 0xe0, 0xd5, 0x2b, 0xf2, 0xe7, 0x38, 0x84,
0xad, 0x56, 0xf7, 0x58, 0xa0, 0x30, 0xce, 0x3d,
0x39, 0xe5, 0x8d, 0x40, 0x20, 0x40, 0x28, 0xde,
0x44, 0xf1, 0x38, 0xe1, 0xf0, 0xf0, 0xc9, 0x93,
0x00, 0x10, 0x8b, 0xdd, 0xbe, 0x0d, 0x00, 0x37,
0x6e, 0xa4, 0x52, 0x00, 0x30, 0x36, 0xf6, 0xc7,
0x1f, 0x00, 0xa0, 0x69, 0x8a, 0x42, 0xeb, 0x0e,
0x0e, 0x00, 0xc0, 0xb2, 0xa8, 0xb3, 0xe8, 0xfa,
0xe7, 0xcf, 0x00, 0xb0, 0xb6, 0x46, 0x54, 0x17,
0x16, 0x0c, 0x03, 0x00, 0x8a, 0x45, 0xda, 0x77,
0x77, 0x97, 0x50, 0xbc, 0x85, 0x44, 0x3f, 0x6a,
0x34, 0x08, 0x69, 0x37, 0xa0, 0xdd, 0x3e, 0x42,
0x80, 0x5b, 0x03, 0x84, 0x44, 0xc3, 0x15, 0x42,
0xf4, 0x00, 0x4d, 0x23, 0x24, 0x19, 0xee, 0xbc,
0x88, 0x98, 0x58, 0x27, 0x50, 0xec, 0x27, 0x1c,
0x8b, 0xc7, 0x19, 0xd1, 0x77, 0xfb, 0xbd, 0xc0,
0x5a, 0xad, 0xfb, 0x7f, 0x82, 0xb8, 0x88, 0x80,
0x9b, 0x52, 0x47, 0x08, 0xf0, 0x0a, 0x11, 0xa8,
0xaa, 0x84, 0xe1, 0xb0, 0x48, 0x2d, 0x42, 0x59,
0xee, 0x46, 0xf1, 0x7f, 0x6f, 0xd7, 0x10, 0x02,
0x04, 0x21, 0x91, 0x22, 0xcd, 0x26, 0xa1, 0xb8,
0xc2, 0xbc, 0xa9, 0x23, 0xd6, 0x79, 0x6b, 0xe1,
0xc8, 0xe7, 0xb4, 0xaf, 0x47, 0x64, 0xbc, 0xa9,
0xe6, 0x9d, 0x3f, 0xca, 0xbc, 0x45, 0xe8, 0x45,
0x41, 0xd8, 0x5b, 0xbc, 0xde, 0xf5, 0xff, 0x23,
0xfb, 0x13, 0xd9, 0xb2, 0xe7, 0x6c, 0xa9, 0xad,
0xfd, 0x2d, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};

View File

@@ -0,0 +1,367 @@
/* dialog_information.png - 863 bytes */
static const unsigned char dialog_information_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x03, 0x02, 0x06, 0x20, 0x32, 0x3a,
0x50, 0x9c, 0xf7, 0x00, 0x00, 0x00, 0x35, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
0x6e, 0x74, 0x00, 0x28, 0x63, 0x29, 0x20, 0x32,
0x30, 0x30, 0x34, 0x20, 0x4a, 0x61, 0x6b, 0x75,
0x62, 0x20, 0x53, 0x74, 0x65, 0x69, 0x6e, 0x65,
0x72, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74,
0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
0x54, 0x68, 0x65, 0x20, 0x47, 0x49, 0x4d, 0x50,
0x90, 0xd9, 0x8b, 0x6f, 0x00, 0x00, 0x02, 0xab,
0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x92,
0x4b, 0x48, 0x54, 0x71, 0x14, 0xc6, 0xbf, 0xff,
0xdc, 0x3b, 0xe3, 0xbd, 0x3a, 0xd7, 0x47, 0x26,
0x59, 0x6a, 0x66, 0x52, 0x3e, 0x08, 0x45, 0x22,
0x13, 0xc4, 0xa1, 0x06, 0x25, 0xd4, 0xa4, 0xa2,
0x90, 0x6c, 0x62, 0xca, 0x70, 0x61, 0xb4, 0x08,
0x13, 0xb2, 0x45, 0xcb, 0x10, 0x31, 0xaa, 0x45,
0x8f, 0x4d, 0xa2, 0x8b, 0x88, 0xa0, 0x02, 0x03,
0x03, 0x25, 0xc8, 0x10, 0x49, 0x74, 0x26, 0x4a,
0x4a, 0xcd, 0x8a, 0x34, 0x95, 0x4c, 0x9d, 0x71,
0x74, 0x9c, 0xb9, 0x77, 0xae, 0xf7, 0xf5, 0x6f,
0xe5, 0xa0, 0x35, 0x11, 0x7e, 0xab, 0x73, 0xe0,
0xfb, 0x7e, 0x9c, 0x73, 0x38, 0x04, 0x11, 0x54,
0x5c, 0xd9, 0xd4, 0x4c, 0x29, 0x1c, 0x06, 0x25,
0x29, 0x20, 0x84, 0x98, 0x88, 0x31, 0xcb, 0x10,
0xfa, 0xb4, 0xff, 0x65, 0x6b, 0xe3, 0x9f, 0x5e,
0x76, 0x7d, 0x53, 0x54, 0xde, 0x94, 0xc1, 0x30,
0xa4, 0xef, 0x62, 0x6d, 0x65, 0x5a, 0xb9, 0xbd,
0x00, 0x71, 0x02, 0x0f, 0x55, 0x37, 0xe0, 0xf1,
0x05, 0x53, 0x7b, 0x7a, 0x3f, 0x5c, 0x21, 0x26,
0xe6, 0x2c, 0xa5, 0x7a, 0x49, 0x7f, 0x57, 0xeb,
0xd7, 0x88, 0x00, 0x96, 0x25, 0x6f, 0xef, 0xb5,
0xd4, 0x6f, 0xdf, 0x93, 0xb9, 0x63, 0x2c, 0x10,
0x52, 0x46, 0x67, 0x7d, 0x92, 0x12, 0x5a, 0x55,
0x59, 0x45, 0xd3, 0xa3, 0x6d, 0x25, 0xf9, 0x59,
0xe9, 0xe9, 0xc9, 0x7b, 0x5b, 0x6e, 0x3d, 0x76,
0x01, 0x88, 0x5f, 0xcb, 0x30, 0x6b, 0x45, 0x49,
0xd5, 0xd5, 0xdb, 0xf5, 0xe7, 0x8f, 0x96, 0x15,
0x1f, 0xcc, 0xf9, 0xac, 0xa8, 0xba, 0x9b, 0xb7,
0x98, 0x15, 0x00, 0x44, 0xa7, 0x20, 0xaa, 0x4e,
0x0d, 0xef, 0x4a, 0x68, 0x96, 0x8b, 0xe6, 0x10,
0xcd, 0x73, 0x3b, 0x75, 0x26, 0x25, 0x73, 0x72,
0xfc, 0x6d, 0x27, 0x00, 0x98, 0xc2, 0x24, 0x86,
0x3d, 0x57, 0x6e, 0x2f, 0x40, 0x20, 0xa4, 0x8e,
0xb1, 0x2c, 0x43, 0x2d, 0x66, 0xc6, 0x20, 0x84,
0x50, 0x50, 0x18, 0x9a, 0x6e, 0x28, 0x94, 0xc2,
0xe8, 0x1a, 0x9c, 0xec, 0x2e, 0x2a, 0xcc, 0x01,
0xc3, 0x72, 0xa7, 0xd6, 0x72, 0x61, 0xc0, 0xaa,
0x42, 0xe3, 0x05, 0x2b, 0x0f, 0x59, 0xd1, 0x57,
0x55, 0xcd, 0x48, 0x34, 0x33, 0xa6, 0x0b, 0x89,
0xb1, 0x9c, 0x73, 0x57, 0xb2, 0xe0, 0xc8, 0xdf,
0xbd, 0xd5, 0x01, 0x25, 0x90, 0x3a, 0xe5, 0x11,
0xfd, 0x3c, 0xcf, 0x21, 0x20, 0xa9, 0x5c, 0x6d,
0x5d, 0x83, 0x69, 0xc3, 0x0d, 0x08, 0x21, 0x44,
0xd1, 0x74, 0x48, 0xb2, 0x6a, 0x32, 0x0c, 0x2a,
0x26, 0x58, 0xa3, 0xe0, 0xf5, 0x4b, 0x2e, 0x51,
0x0a, 0x31, 0x2b, 0x41, 0x49, 0x1b, 0x9e, 0x96,
0x86, 0x15, 0x45, 0x37, 0xa9, 0xaa, 0xb1, 0x16,
0xe1, 0x01, 0x88, 0x61, 0x40, 0x0c, 0xcf, 0x4a,
0x5e, 0x5f, 0x20, 0x46, 0x94, 0x55, 0xcb, 0x8a,
0xa4, 0xfa, 0x33, 0x92, 0x63, 0x31, 0xfa, 0xc3,
0xf7, 0x5e, 0x54, 0x74, 0x3a, 0xb7, 0x24, 0x29,
0xee, 0x6f, 0x8b, 0x1e, 0xc1, 0x6a, 0x49, 0xf0,
0xfa, 0x83, 0x88, 0x13, 0x78, 0xb5, 0xa3, 0xad,
0x59, 0xdc, 0xb0, 0x82, 0x99, 0xd1, 0x06, 0x7a,
0xde, 0x0c, 0x83, 0x8f, 0x62, 0x73, 0x27, 0x7e,
0x2d, 0x8b, 0x00, 0xf0, 0xd3, 0x27, 0xea, 0x1f,
0x27, 0xbc, 0xfe, 0xde, 0xe1, 0x99, 0x85, 0x25,
0x51, 0x36, 0x57, 0xec, 0x4f, 0xab, 0x18, 0x72,
0x8d, 0xc1, 0xca, 0x61, 0xe2, 0xaf, 0x1b, 0x6c,
0x13, 0x42, 0xc7, 0x3b, 0xbb, 0xfa, 0xe5, 0x99,
0xe9, 0xf9, 0xec, 0xb4, 0x24, 0xeb, 0xa1, 0x6b,
0xed, 0x03, 0x37, 0xcf, 0x1c, 0xce, 0xba, 0xe4,
0xfe, 0x32, 0x1f, 0x62, 0x58, 0x92, 0xe8, 0xb4,
0x67, 0x55, 0xfb, 0x17, 0x97, 0x72, 0xdc, 0x83,
0x23, 0xaa, 0xc0, 0xfa, 0x4a, 0xc3, 0xab, 0xaf,
0xff, 0x83, 0x63, 0xa7, 0x1b, 0xab, 0x64, 0x2a,
0x3c, 0x2f, 0x2b, 0x2d, 0xb2, 0x14, 0x1e, 0xc8,
0x46, 0x34, 0xcf, 0x41, 0xd5, 0x75, 0xf8, 0x96,
0x45, 0x0c, 0xb9, 0xc6, 0xf1, 0xce, 0x35, 0xa2,
0xc5, 0x71, 0xd2, 0xe5, 0x27, 0xed, 0x37, 0x1e,
0x44, 0x04, 0x00, 0x40, 0x6d, 0x5d, 0x43, 0x62,
0x88, 0x6e, 0x71, 0x05, 0x64, 0xa4, 0x3b, 0x4e,
0x24, 0x31, 0x84, 0x00, 0x2c, 0x0b, 0x74, 0x75,
0xcf, 0x05, 0x19, 0xcd, 0xbf, 0xaf, 0xa3, 0xed,
0xce, 0x14, 0xfe, 0xa7, 0x9a, 0x1a, 0xbb, 0xd5,
0xe9, 0xb4, 0x51, 0xcf, 0x62, 0x1f, 0x15, 0x65,
0x17, 0xfd, 0x3e, 0xf9, 0x8c, 0x3a, 0x9d, 0x36,
0x1a, 0xc9, 0xcb, 0xfe, 0x83, 0xa1, 0x02, 0xc0,
0xfd, 0xbb, 0x0f, 0x91, 0x9d, 0x9b, 0x8d, 0xe9,
0xa9, 0x69, 0x6c, 0x5a, 0x4e, 0xa7, 0x8d, 0xce,
0xcc, 0xbe, 0x32, 0x02, 0xd2, 0x10, 0xfd, 0x34,
0xfa, 0xc2, 0xd8, 0xec, 0x04, 0x00, 0x50, 0x55,
0x7d, 0xf2, 0x7a, 0x8d, 0x20, 0xc4, 0x1f, 0x59,
0x58, 0x58, 0x78, 0x9d, 0x97, 0x17, 0xfb, 0x28,
0x92, 0xe9, 0x37, 0x56, 0x4c, 0x36, 0x5e, 0x7c,
0x8a, 0x1d, 0x04, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
/* dialog_information.png - 2022 bytes */
static const unsigned char dialog_information_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x07,
0x71, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
0x97, 0x5f, 0x4c, 0x1c, 0xd5, 0x17, 0xc7, 0xcf,
0x9d, 0x3b, 0x7f, 0x76, 0x87, 0x59, 0xd8, 0xff,
0x05, 0x8a, 0xa2, 0x82, 0x2d, 0x01, 0x6a, 0x11,
0x68, 0x42, 0x8a, 0x56, 0xb0, 0x16, 0xa3, 0xa2,
0x09, 0xc6, 0xc2, 0x43, 0xf5, 0xc1, 0xc4, 0x07,
0x35, 0x31, 0x8d, 0x51, 0x1f, 0x6c, 0xa2, 0x0f,
0x3e, 0x19, 0x23, 0xa9, 0x06, 0xa3, 0x26, 0xad,
0x25, 0x0a, 0x89, 0x69, 0x0d, 0x31, 0x56, 0xab,
0x8d, 0x0f, 0xd5, 0x8a, 0x69, 0x00, 0x53, 0x28,
0x74, 0xa9, 0x29, 0x8d, 0x2b, 0xff, 0x97, 0x5d,
0xf6, 0xff, 0xcc, 0xce, 0xce, 0xce, 0xcc, 0x9d,
0xeb, 0xc3, 0xb8, 0xf1, 0xd7, 0xfc, 0x7e, 0x09,
0x14, 0xf1, 0x97, 0x78, 0x1e, 0xe6, 0x9b, 0xc9,
0xdc, 0xb9, 0xf7, 0x7c, 0xee, 0x39, 0xe7, 0xde,
0x1c, 0x80, 0x7f, 0xb9, 0xa1, 0xad, 0xfe, 0xf8,
0xec, 0xb3, 0xcf, 0x3d, 0xf7, 0xf2, 0xcb, 0x2c,
0x0b, 0x00, 0x80, 0xd0, 0xf3, 0xcf, 0x23, 0x84,
0x31, 0xcf, 0x3f, 0xfe, 0x38, 0xa5, 0x94, 0x52,
0xda, 0xd8, 0x08, 0x60, 0x59, 0x86, 0x11, 0x0c,
0x02, 0x30, 0x0c, 0xc7, 0xc5, 0x62, 0x08, 0x21,
0x84, 0x50, 0x28, 0x44, 0x29, 0x21, 0xba, 0xfe,
0xf5, 0xd7, 0x00, 0x00, 0x94, 0x7e, 0xfc, 0xf1,
0xe0, 0xe0, 0xc9, 0x93, 0xc7, 0x8f, 0x9b, 0xe6,
0xff, 0x0d, 0xc0, 0x76, 0xfc, 0xfe, 0xfb, 0x6d,
0xc7, 0x3e, 0xfb, 0xec, 0xc0, 0x81, 0xce, 0xce,
0x83, 0x07, 0x2b, 0x2a, 0x6a, 0x6b, 0x77, 0xef,
0x6e, 0x68, 0x10, 0x04, 0x49, 0x92, 0x24, 0x51,
0x04, 0x10, 0x04, 0x9e, 0xe7, 0x38, 0x00, 0x45,
0xc9, 0xe5, 0x34, 0x0d, 0x20, 0x1e, 0x4f, 0x26,
0x33, 0x19, 0x80, 0xdf, 0x7f, 0xbf, 0x71, 0xe3,
0xda, 0x35, 0x4d, 0x9b, 0x9c, 0x9c, 0x98, 0xb8,
0x74, 0x29, 0x1a, 0xb5, 0x2c, 0xd3, 0x2c, 0x14,
0x9e, 0x79, 0xc6, 0x06, 0x19, 0x1d, 0xfd, 0xc7,
0x00, 0x6c, 0xc7, 0x1f, 0x78, 0xc0, 0xef, 0x0f,
0x06, 0xcb, 0xcb, 0xbf, 0xfd, 0xf6, 0xd0, 0xa1,
0xee, 0xee, 0xbe, 0x3e, 0x51, 0x34, 0x0c, 0x8c,
0x1d, 0x0e, 0x80, 0x50, 0x68, 0x61, 0x21, 0x9d,
0x06, 0x90, 0x24, 0xa7, 0x13, 0x00, 0x80, 0x10,
0x4a, 0x09, 0xb1, 0xac, 0x42, 0xc1, 0x30, 0x4c,
0xd3, 0x34, 0x2d, 0xcb, 0xb2, 0x10, 0xa2, 0xb4,
0xae, 0xae, 0xaa, 0xca, 0xe3, 0x61, 0xd9, 0xaa,
0xaa, 0xb2, 0x32, 0x9e, 0xc7, 0x78, 0x64, 0xe4,
0xf4, 0xe9, 0xe1, 0xe1, 0x7c, 0x3e, 0x12, 0x59,
0x59, 0x59, 0x5e, 0x7e, 0xe4, 0x11, 0x1b, 0xe4,
0xe2, 0xc5, 0x6d, 0x03, 0xb0, 0x1d, 0xaf, 0xa8,
0x00, 0x60, 0x18, 0x96, 0x0d, 0x85, 0x5e, 0x78,
0xe1, 0xe8, 0xd1, 0xd7, 0x5e, 0xf3, 0x7a, 0xe7,
0xe6, 0x22, 0x11, 0x5d, 0x07, 0x98, 0x9f, 0x5f,
0x5f, 0x4f, 0x26, 0x01, 0x9a, 0x9b, 0x6b, 0x6b,
0x3d, 0x1e, 0xcb, 0x92, 0x24, 0x87, 0x83, 0x65,
0x09, 0xa1, 0x14, 0x80, 0x52, 0xd3, 0xa4, 0x94,
0x52, 0x00, 0xcb, 0x8a, 0xc7, 0xb3, 0xd9, 0x42,
0x41, 0xd3, 0x42, 0xa1, 0x85, 0x85, 0x54, 0x4a,
0xd7, 0x7d, 0x3e, 0x97, 0xcb, 0xe1, 0x90, 0xa4,
0x83, 0x07, 0x1b, 0x1b, 0x2b, 0x2a, 0x24, 0x69,
0x60, 0xe0, 0xbd, 0xf7, 0xfa, 0xfb, 0xd3, 0x69,
0x4d, 0x53, 0xd5, 0x5c, 0xae, 0xa1, 0xc1, 0x06,
0x89, 0x44, 0x36, 0xf2, 0x8f, 0xd9, 0x04, 0x23,
0x62, 0x98, 0xa3, 0x47, 0x7b, 0x7a, 0x0e, 0x1f,
0x3e, 0x72, 0xa4, 0xac, 0x2c, 0x1e, 0x57, 0x14,
0x4a, 0x01, 0x42, 0xa1, 0xc5, 0xc5, 0xf5, 0x75,
0x80, 0xce, 0xce, 0x7b, 0xee, 0x09, 0x06, 0x09,
0x09, 0x04, 0xca, 0xca, 0x04, 0x41, 0xd3, 0x4a,
0x4a, 0x1c, 0x0e, 0x96, 0xcd, 0xe5, 0x24, 0xc9,
0xe9, 0xe4, 0xf9, 0x5c, 0xce, 0xe5, 0x72, 0x3a,
0x39, 0x4e, 0x96, 0xab, 0xaa, 0xfc, 0x7e, 0x51,
0x2c, 0x14, 0xbc, 0x5e, 0x97, 0x8b, 0xe7, 0x13,
0x89, 0x44, 0x22, 0x9b, 0xcd, 0xe7, 0x15, 0x65,
0x76, 0x76, 0x79, 0x39, 0x93, 0x51, 0xd5, 0x87,
0x1f, 0xee, 0xee, 0xee, 0xe9, 0x91, 0xa4, 0xe2,
0x7a, 0x9b, 0x8d, 0xc0, 0x86, 0x00, 0x08, 0x31,
0x0c, 0xc7, 0x75, 0x75, 0xb9, 0xdd, 0x7e, 0x7f,
0x30, 0x88, 0xf1, 0xf4, 0xf4, 0xfc, 0x7c, 0x3a,
0x0d, 0x50, 0x55, 0x15, 0x0c, 0xf2, 0xbc, 0x61,
0x60, 0x8c, 0x31, 0x42, 0x9a, 0x66, 0x17, 0x69,
0x3e, 0xcf, 0x30, 0x0c, 0x83, 0x50, 0x2e, 0x87,
0x31, 0x42, 0x08, 0xc9, 0xb2, 0xfd, 0x3d, 0x9b,
0xe5, 0x38, 0x96, 0x65, 0x98, 0x6c, 0xb6, 0xa4,
0x44, 0x10, 0x58, 0x36, 0x1e, 0x77, 0xb9, 0x44,
0x91, 0xe3, 0xd6, 0xd7, 0xd7, 0xd6, 0xd2, 0x69,
0x55, 0xcd, 0x64, 0x6a, 0x6a, 0xee, 0xbc, 0xb3,
0xba, 0x9a, 0x52, 0x84, 0x30, 0x66, 0xd9, 0x43,
0x87, 0x36, 0x0b, 0xc0, 0x6e, 0x34, 0x80, 0x52,
0xcb, 0x32, 0xcd, 0xdd, 0xbb, 0x1d, 0x0e, 0x87,
0xc3, 0xe1, 0x00, 0x88, 0xc5, 0x32, 0x99, 0xc5,
0x45, 0x00, 0x86, 0x61, 0x18, 0xa7, 0x53, 0x96,
0xed, 0x51, 0x96, 0x85, 0x10, 0x42, 0x00, 0xaa,
0x6a, 0x03, 0xa8, 0xaa, 0x0d, 0x50, 0x04, 0xd3,
0xf5, 0x74, 0x5a, 0x51, 0x0a, 0x85, 0x44, 0x42,
0x92, 0x9c, 0x4e, 0x8e, 0x53, 0x14, 0xcb, 0xa2,
0x14, 0xc0, 0x34, 0xb3, 0x59, 0x55, 0xd5, 0x75,
0x86, 0x09, 0x04, 0x3c, 0x9e, 0xd2, 0xd2, 0x60,
0x90, 0x52, 0x42, 0x4c, 0xb3, 0xae, 0x6e, 0xdb,
0x00, 0xec, 0xdc, 0x8f, 0x44, 0x52, 0xa9, 0x6c,
0x56, 0x96, 0x6b, 0x6a, 0x4a, 0x4b, 0x45, 0x91,
0xe7, 0x55, 0xd5, 0x34, 0x2d, 0x8b, 0xd2, 0x4c,
0x26, 0x1a, 0x4d, 0xa7, 0xf3, 0x79, 0x4d, 0x2b,
0x2f, 0xf7, 0x78, 0x44, 0xd1, 0x30, 0x38, 0x0e,
0x63, 0x84, 0x54, 0x95, 0x10, 0x4a, 0x29, 0x4d,
0xa7, 0x15, 0x45, 0x55, 0x0d, 0x23, 0x12, 0xd1,
0x75, 0xd3, 0x24, 0x44, 0x96, 0x5d, 0x2e, 0xa7,
0x93, 0xe7, 0x79, 0xde, 0x34, 0x09, 0xa1, 0x14,
0x21, 0x86, 0x01, 0x40, 0xc8, 0xe7, 0xcb, 0xe5,
0xf2, 0x79, 0x4d, 0x2b, 0x14, 0x18, 0x06, 0x63,
0x8c, 0x57, 0x57, 0xb7, 0x2d, 0x85, 0xec, 0x28,
0x8c, 0x8e, 0x26, 0x93, 0x89, 0x44, 0x2c, 0x46,
0xe9, 0x8e, 0x1d, 0x6e, 0xb7, 0xd3, 0xa9, 0xeb,
0x0e, 0x07, 0xc7, 0x61, 0x9c, 0xcb, 0x35, 0x37,
0xd7, 0xd4, 0xf8, 0xfd, 0x5e, 0x6f, 0x20, 0x50,
0x56, 0xe6, 0x70, 0xb0, 0x6c, 0x32, 0xa9, 0x28,
0x85, 0xc2, 0xf5, 0xeb, 0xa9, 0x94, 0xa2, 0xe8,
0xfa, 0x95, 0x2b, 0xc5, 0x94, 0x69, 0x69, 0xa9,
0xad, 0xf5, 0xfb, 0x9b, 0x9a, 0xee, 0xbb, 0xaf,
0xbe, 0x7e, 0xc7, 0x8e, 0x03, 0x07, 0x34, 0x4d,
0xd7, 0x09, 0xc1, 0x78, 0xe7, 0x4e, 0xbf, 0x5f,
0x92, 0x30, 0x5e, 0x5b, 0x8b, 0x46, 0x63, 0x31,
0x4d, 0xb3, 0x57, 0x1c, 0x1b, 0xdb, 0xc6, 0x08,
0x10, 0xa2, 0xeb, 0xc7, 0x8f, 0x4f, 0x4f, 0x5f,
0xba, 0xf4, 0xc3, 0x0f, 0x7d, 0x7d, 0x8f, 0x3e,
0xda, 0xdb, 0xfb, 0xf4, 0xd3, 0x2c, 0x7b, 0xed,
0xda, 0xd2, 0x52, 0x26, 0xa3, 0xeb, 0x18, 0x33,
0x0c, 0x42, 0x84, 0x04, 0x83, 0x6e, 0xb7, 0x28,
0x56, 0x57, 0x57, 0x57, 0x07, 0x02, 0x92, 0x54,
0x5b, 0x0b, 0x80, 0x10, 0x40, 0xf1, 0x69, 0x59,
0x76, 0xca, 0xe4, 0xf3, 0xba, 0x6e, 0x18, 0x84,
0x2c, 0x2c, 0xdc, 0x7e, 0x7b, 0x20, 0x20, 0x49,
0x6b, 0x6b, 0x4d, 0x4d, 0x77, 0xdc, 0x11, 0x0c,
0x3e, 0xf4, 0xd0, 0xc0, 0xc0, 0xc0, 0xc0, 0x07,
0x1f, 0x58, 0x96, 0x65, 0x99, 0xa6, 0x61, 0x7c,
0xf4, 0xd1, 0x66, 0x01, 0xf0, 0x46, 0x03, 0xae,
0x5c, 0x99, 0x9c, 0x1c, 0x1b, 0x8b, 0x46, 0xef,
0xbe, 0xbb, 0xae, 0xae, 0xa9, 0x29, 0x18, 0xc4,
0x18, 0x80, 0xd2, 0xbd, 0x7b, 0xdb, 0xda, 0x5a,
0x5a, 0x1a, 0x1b, 0x59, 0x36, 0x95, 0x52, 0x94,
0x42, 0x61, 0x61, 0xc1, 0xe7, 0x2b, 0x2d, 0x15,
0x04, 0x51, 0x9c, 0x9e, 0x0e, 0x87, 0x93, 0xc9,
0xfe, 0x7e, 0xfb, 0xec, 0xff, 0xfe, 0x7b, 0x59,
0xd6, 0x34, 0xc3, 0x18, 0x1a, 0x2a, 0x2d, 0x15,
0x45, 0x8e, 0x6b, 0x6d, 0x55, 0x14, 0x4d, 0x33,
0xcd, 0x8b, 0x17, 0x45, 0x91, 0xe3, 0x1c, 0x8e,
0xee, 0xee, 0x89, 0x89, 0xf1, 0xf1, 0xb1, 0x31,
0x5d, 0xbf, 0x7c, 0x79, 0x72, 0x72, 0x72, 0xf2,
0xec, 0xd9, 0x53, 0xa7, 0x4e, 0x9c, 0xe8, 0xef,
0xff, 0xf0, 0xc3, 0x6d, 0x4d, 0x21, 0xdb, 0x2c,
0xcb, 0x34, 0x5f, 0x7d, 0x75, 0x72, 0xf2, 0x97,
0x5f, 0xc6, 0xc7, 0x6f, 0xdc, 0x48, 0x26, 0xa3,
0xd1, 0x95, 0x15, 0xa7, 0x93, 0x10, 0xcb, 0x42,
0xc8, 0x34, 0x55, 0xb5, 0x50, 0x20, 0x64, 0x75,
0x55, 0x92, 0x9c, 0x4e, 0x96, 0x45, 0xc8, 0xde,
0xfb, 0xd5, 0x55, 0xb7, 0x5b, 0x14, 0x79, 0xde,
0x30, 0xec, 0x39, 0x42, 0x21, 0x00, 0x4a, 0x59,
0xb6, 0xb2, 0x32, 0x95, 0x8a, 0xc7, 0x23, 0x11,
0x5d, 0x3f, 0x77, 0xee, 0xdc, 0xb9, 0x6f, 0xbe,
0x59, 0x5b, 0xb3, 0x2c, 0x42, 0x4c, 0xf3, 0xa5,
0x97, 0x36, 0xef, 0xcf, 0x2d, 0x02, 0xd8, 0x17,
0x8b, 0x61, 0xd8, 0xa7, 0x44, 0x6f, 0xef, 0x57,
0x5f, 0x8d, 0x8c, 0x8c, 0x8c, 0x70, 0x9c, 0xdf,
0xef, 0x72, 0x39, 0x9d, 0xe5, 0xe5, 0x33, 0x33,
0xbf, 0xfe, 0xfa, 0xdb, 0x6f, 0xe1, 0x70, 0x36,
0x9b, 0x4c, 0xae, 0xaf, 0x7b, 0xbd, 0x76, 0x6a,
0x99, 0xe6, 0xe2, 0xe2, 0xc2, 0x42, 0x38, 0xec,
0xf3, 0x85, 0x42, 0xa1, 0xd0, 0xec, 0xec, 0x8f,
0x3f, 0x62, 0x8c, 0x10, 0xc3, 0xec, 0xdf, 0x3f,
0x3c, 0x3c, 0x34, 0x34, 0x3c, 0xec, 0xf5, 0x5a,
0x16, 0x21, 0x84, 0xf4, 0xf5, 0xd9, 0xf3, 0x17,
0x6b, 0xe0, 0x1f, 0x00, 0xb8, 0x19, 0x24, 0x1c,
0x56, 0xd5, 0x7c, 0x3e, 0x9f, 0x8f, 0x44, 0x56,
0x57, 0x57, 0x57, 0x97, 0x96, 0x4a, 0x4a, 0x30,
0x06, 0x50, 0xd5, 0x07, 0x1f, 0xbc, 0x7c, 0x79,
0x7c, 0xfc, 0xbb, 0xef, 0x5e, 0x7c, 0x51, 0x51,
0xd2, 0xe9, 0xa9, 0xa9, 0xcf, 0x3f, 0x9f, 0x9a,
0x9a, 0x9a, 0xba, 0x70, 0xe1, 0xfd, 0xf7, 0x45,
0xb1, 0xa4, 0x84, 0x65, 0x5f, 0x7f, 0x5d, 0x96,
0x15, 0x25, 0x95, 0xd2, 0x34, 0x59, 0x96, 0x65,
0x59, 0x8e, 0x44, 0x8a, 0xf3, 0xdd, 0xaa, 0x1f,
0x5b, 0x06, 0x28, 0x9a, 0x5d, 0x6c, 0xaf, 0xbc,
0x72, 0xf6, 0xec, 0xc8, 0xc8, 0xe9, 0xd3, 0x95,
0x95, 0x0c, 0x43, 0x29, 0xc6, 0x3e, 0x5f, 0x57,
0x57, 0x57, 0xd7, 0x93, 0x4f, 0xf2, 0xbc, 0xcf,
0xe7, 0xf1, 0xec, 0xdd, 0xcb, 0x30, 0x1d, 0x1d,
0x9d, 0x9d, 0x4f, 0x3d, 0xe5, 0x70, 0x10, 0x42,
0x08, 0xc7, 0xed, 0xdc, 0x79, 0xea, 0xd4, 0xe0,
0xe0, 0xa7, 0x9f, 0xde, 0x76, 0x1b, 0x21, 0x84,
0x10, 0xf2, 0xc6, 0x1b, 0x5b, 0x5d, 0xbf, 0x68,
0x9b, 0x38, 0x85, 0xfe, 0xb7, 0xcd, 0xce, 0x2e,
0x2f, 0x0b, 0x42, 0x3c, 0x5e, 0x5e, 0xae, 0x28,
0x89, 0x04, 0x42, 0xd7, 0xaf, 0xcf, 0xcd, 0x5d,
0xb8, 0x00, 0xa0, 0xaa, 0xb2, 0xac, 0xeb, 0xff,
0xb1, 0x43, 0x0c, 0xc3, 0x00, 0x00, 0xac, 0xad,
0xc5, 0x62, 0x00, 0x00, 0x2b, 0x2b, 0x2b, 0x2b,
0xf3, 0xf3, 0x0c, 0x33, 0x38, 0x78, 0xf2, 0xe4,
0x89, 0x13, 0x5f, 0x7e, 0xf9, 0x77, 0x01, 0xb6,
0x1c, 0x81, 0x89, 0x89, 0xf3, 0xe7, 0xdf, 0x7e,
0x7b, 0x7c, 0xbc, 0xbd, 0xfd, 0xde, 0x7b, 0x0b,
0x05, 0x00, 0x97, 0x4b, 0x10, 0x42, 0x21, 0x4a,
0xdb, 0xdb, 0xdb, 0xdb, 0xbb, 0xbb, 0x01, 0x3a,
0x3a, 0x3a, 0x3a, 0x1e, 0x7b, 0x0c, 0xa0, 0xbe,
0xbe, 0xbe, 0x7e, 0xcf, 0x1e, 0x00, 0x9f, 0xcf,
0xed, 0xc6, 0x18, 0xa0, 0xa6, 0xa6, 0xba, 0x1a,
0x6d, 0xb9, 0x0b, 0xf9, 0x6f, 0xdb, 0xf0, 0x18,
0xdd, 0xc8, 0x2a, 0x2b, 0x2b, 0x2b, 0x3d, 0x1e,
0x55, 0x15, 0x04, 0x41, 0x08, 0x04, 0xba, 0xba,
0x58, 0x16, 0xe3, 0xa5, 0x25, 0x00, 0x9e, 0x17,
0x04, 0x9e, 0x07, 0xc8, 0xe5, 0x14, 0x25, 0x93,
0x01, 0xf8, 0xf9, 0xe7, 0xd1, 0xd1, 0x99, 0x19,
0x80, 0xab, 0x57, 0xaf, 0x5e, 0x0d, 0x87, 0xdf,
0x7c, 0x73, 0x66, 0x66, 0x66, 0x26, 0x1c, 0xfe,
0xe9, 0xa7, 0xbf, 0xbb, 0xfe, 0x96, 0x53, 0xe8,
0x4f, 0x7e, 0xdc, 0xd0, 0xd0, 0xd0, 0x70, 0xd7,
0x5d, 0xef, 0xbc, 0xd3, 0xd6, 0xd6, 0xd6, 0x56,
0x5e, 0x0e, 0xd0, 0xd4, 0xd4, 0xdc, 0xfc, 0xc4,
0x13, 0x7f, 0x01, 0x70, 0x1c, 0xc7, 0xc5, 0xe3,
0x00, 0x2d, 0x2d, 0x2d, 0x2d, 0x9a, 0x46, 0xa9,
0xfd, 0xdf, 0x5b, 0x6f, 0xd9, 0xfa, 0xee, 0xbb,
0xb6, 0x16, 0x93, 0x8e, 0x90, 0x5b, 0xf5, 0xe0,
0x16, 0x83, 0x29, 0x08, 0xb6, 0x8a, 0x62, 0x51,
0x5b, 0x5b, 0x5b, 0x5b, 0x77, 0xed, 0xda, 0xb3,
0xa7, 0xa7, 0xa7, 0xa7, 0x67, 0xff, 0xfe, 0xa1,
0xa1, 0xe9, 0xe9, 0xe9, 0xe9, 0x5c, 0xce, 0xef,
0xf7, 0xfb, 0x03, 0x81, 0xb2, 0x32, 0x80, 0x58,
0x2c, 0x1a, 0x4d, 0x24, 0x14, 0x65, 0xdf, 0xbe,
0x7d, 0xfb, 0x02, 0x01, 0x49, 0x3a, 0x76, 0xec,
0xd8, 0xb1, 0x4f, 0x3e, 0x69, 0x6b, 0xb3, 0x8b,
0x38, 0x91, 0xb0, 0xe7, 0xc9, 0xe7, 0x6d, 0x55,
0x55, 0x5b, 0x73, 0xb9, 0x9b, 0xc1, 0xb6, 0x0d,
0xa0, 0xa4, 0xe4, 0x66, 0x2d, 0x82, 0x78, 0xbd,
0xb6, 0x06, 0x02, 0xbd, 0xbd, 0xbd, 0xbd, 0x87,
0x0f, 0x9f, 0x3f, 0x9f, 0x4a, 0xa5, 0x52, 0xe9,
0xf4, 0xdc, 0x9c, 0xc7, 0xe3, 0xf1, 0xb8, 0xdd,
0xbb, 0x76, 0x9d, 0x39, 0x73, 0xe6, 0xcc, 0x17,
0x5f, 0x1c, 0x39, 0x62, 0x8f, 0x8b, 0xc7, 0x6d,
0x5d, 0x5f, 0xb7, 0x35, 0x95, 0xba, 0x19, 0x20,
0x99, 0xb4, 0x75, 0xe3, 0x5e, 0x79, 0x8b, 0xe5,
0xc4, 0xfc, 0x59, 0xfc, 0x3c, 0x6f, 0xab, 0xdd,
0x46, 0xfe, 0xf5, 0xce, 0x71, 0x37, 0x6b, 0x31,
0x35, 0x8a, 0x0e, 0x15, 0x6f, 0xe6, 0xe2, 0xce,
0x17, 0x2f, 0xb0, 0xad, 0x37, 0xf7, 0xff, 0x5a,
0xfb, 0x03, 0x24, 0x50, 0xc3, 0x51, 0x78, 0x54,
0xe6, 0x96, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};

265
art/tango/dialog_warning.h Normal file
View File

@@ -0,0 +1,265 @@
/* dialog_warning.png - 603 bytes */
static const unsigned char dialog_warning_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd6, 0x02, 0x10, 0x0e, 0x27, 0x2d, 0xb7,
0xee, 0x92, 0x77, 0x00, 0x00, 0x01, 0xe8, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0xc1,
0x4a, 0x1b, 0x61, 0x14, 0x85, 0xbf, 0x3b, 0x99,
0xce, 0x34, 0x89, 0x33, 0x83, 0x10, 0x99, 0x4a,
0xed, 0x46, 0x43, 0xc4, 0x20, 0x86, 0x41, 0x4a,
0x9a, 0x30, 0x04, 0x82, 0x48, 0x63, 0x83, 0x74,
0x17, 0xba, 0x10, 0x22, 0x5d, 0x74, 0xe7, 0x30,
0x1b, 0xf1, 0x09, 0x5c, 0x1b, 0x74, 0x65, 0xc0,
0x42, 0xc0, 0x45, 0x49, 0x56, 0x05, 0xad, 0xaf,
0x50, 0x08, 0x3e, 0x80, 0x50, 0x5c, 0x04, 0x0a,
0x85, 0x16, 0x5c, 0xd4, 0x40, 0x49, 0x31, 0x7f,
0x37, 0xd6, 0x12, 0xc8, 0xb4, 0xf6, 0xc0, 0xbd,
0x8b, 0xcb, 0xe1, 0x3b, 0x67, 0x73, 0x85, 0x08,
0x85, 0xf0, 0xc8, 0x80, 0xb7, 0x00, 0x03, 0x78,
0xdd, 0x80, 0x2f, 0xe3, 0x7c, 0x7a, 0x14, 0xc0,
0x84, 0xa3, 0x79, 0x78, 0x0e, 0x70, 0x01, 0x47,
0x40, 0x75, 0x9c, 0x4f, 0x8b, 0x48, 0xf7, 0x52,
0xb0, 0x5a, 0x58, 0x58, 0xd0, 0x9e, 0xa4, 0x52,
0x5a, 0x0a, 0x56, 0x43, 0xf0, 0xee, 0x0d, 0x30,
0x61, 0x2f, 0x0d, 0x7a, 0x62, 0x77, 0x97, 0x4c,
0xb3, 0x49, 0x1a, 0x74, 0x13, 0xf6, 0xee, 0x05,
0x08, 0xa1, 0x38, 0x05, 0xc5, 0x6c, 0xb9, 0x2c,
0x7a, 0x3e, 0x8f, 0x9e, 0xcf, 0x93, 0x2d, 0x97,
0x65, 0x0a, 0x8a, 0x21, 0x14, 0xf9, 0x97, 0x76,
0xa0, 0x7b, 0x02, 0xc3, 0x5e, 0xa7, 0xa3, 0x3c,
0xcf, 0x53, 0x9e, 0xe7, 0xa9, 0x5e, 0xa7, 0xa3,
0x4e, 0x60, 0xb8, 0x03, 0xdd, 0xbf, 0x36, 0x08,
0x61, 0xc5, 0x85, 0xa5, 0x8c, 0xef, 0x8b, 0xe1,
0xfb, 0x38, 0x8e, 0x83, 0xe3, 0x38, 0x18, 0xbe,
0x4f, 0xc6, 0xf7, 0xc5, 0x85, 0xa5, 0x10, 0x56,
0x22, 0x01, 0x26, 0xec, 0x67, 0xc1, 0x48, 0x04,
0x01, 0xa2, 0x69, 0x58, 0x96, 0x85, 0x65, 0x59,
0x88, 0xa6, 0x91, 0x08, 0x02, 0xb2, 0x60, 0x98,
0xb0, 0x3f, 0x16, 0x10, 0xc2, 0xfa, 0x34, 0xa4,
0xe7, 0x0a, 0x05, 0x8c, 0x52, 0x09, 0x11, 0xc1,
0xb6, 0x6d, 0x6c, 0xdb, 0x46, 0x44, 0x30, 0x4a,
0x25, 0xe6, 0x0a, 0x05, 0xa6, 0x21, 0x1d, 0xc2,
0xfa, 0x08, 0x20, 0x04, 0x31, 0xa0, 0xb1, 0x78,
0x9b, 0xae, 0xe9, 0x3a, 0x22, 0xf2, 0xa7, 0x81,
0x08, 0x9a, 0xae, 0x93, 0x08, 0x02, 0x16, 0xc1,
0x30, 0xa0, 0x11, 0x82, 0xc0, 0xed, 0x0a, 0xe1,
0xd5, 0x2c, 0xb4, 0x5e, 0x2c, 0x2f, 0x1b, 0x93,
0x67, 0x67, 0x10, 0x8b, 0xa1, 0x94, 0xa2, 0xdf,
0xef, 0x03, 0x90, 0x4c, 0x26, 0x11, 0x11, 0xb8,
0xb9, 0xe1, 0x6a, 0x6d, 0x8d, 0x0f, 0xe7, 0xe7,
0x83, 0x4b, 0xa8, 0x37, 0xe0, 0x9d, 0x84, 0x10,
0x7b, 0x0c, 0x57, 0x4f, 0xc1, 0x9a, 0x3f, 0x3e,
0xe6, 0x61, 0xb5, 0x8a, 0x52, 0x0a, 0xa5, 0x14,
0xb5, 0x5a, 0x0d, 0x80, 0x76, 0xbb, 0x8d, 0x88,
0x20, 0x22, 0xfc, 0x38, 0x3d, 0xe5, 0x62, 0x63,
0x83, 0x2e, 0x7c, 0xff, 0x0c, 0x93, 0x9a, 0xc0,
0x66, 0x1c, 0xcc, 0x99, 0x5c, 0x8e, 0x78, 0xa5,
0x72, 0x67, 0x14, 0x11, 0x5c, 0xd7, 0xc5, 0x75,
0xdd, 0x91, 0x5b, 0xbc, 0x52, 0x61, 0x26, 0x97,
0x23, 0x0e, 0xa6, 0xc0, 0xa6, 0x6c, 0xc3, 0xd7,
0x97, 0x90, 0x9a, 0x3d, 0x38, 0x60, 0xa2, 0x5e,
0xbf, 0x4b, 0xff, 0x3d, 0xc0, 0x08, 0x40, 0x44,
0xb8, 0x6e, 0xb5, 0xb8, 0xdc, 0xda, 0xe2, 0x3d,
0x7c, 0x93, 0x43, 0x18, 0x3e, 0x03, 0x79, 0xc0,
0xff, 0xe9, 0x27, 0xf0, 0x11, 0x94, 0xfe, 0x09,
0x0e, 0x07, 0xf0, 0x66, 0x22, 0xe2, 0x2f, 0xa2,
0x74, 0x0d, 0xc3, 0x1e, 0x34, 0x7f, 0x01, 0x97,
0xde, 0x7d, 0x08, 0x1c, 0xb4, 0xe1, 0x13, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};
/* dialog_warning.png - 1456 bytes */
static const unsigned char dialog_warning_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
0x3b, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0xcd, 0x4b, 0x54, 0x5d, 0x1c, 0x7e, 0xce,
0x39, 0xf7, 0xde, 0x99, 0x3b, 0xde, 0xf9, 0xf6,
0x6b, 0x66, 0xd4, 0x66, 0x98, 0x3b, 0x63, 0x3a,
0xca, 0x54, 0x33, 0xa1, 0x92, 0xd0, 0x62, 0x54,
0x0a, 0x84, 0xd2, 0x66, 0x23, 0xe8, 0x26, 0x84,
0xc0, 0x8d, 0x8b, 0xc0, 0x45, 0x86, 0x59, 0xb8,
0x91, 0xfa, 0x0b, 0x5a, 0xb7, 0x0a, 0x42, 0x21,
0xdb, 0x04, 0x12, 0x48, 0x2d, 0x14, 0xa2, 0x31,
0xd2, 0x42, 0xb2, 0x50, 0x98, 0x04, 0x1d, 0x50,
0x52, 0xc7, 0x99, 0x1c, 0xe7, 0xbe, 0x8b, 0xd3,
0xc5, 0xf7, 0xf5, 0xa3, 0x2f, 0xf3, 0xa5, 0x17,
0xde, 0xdf, 0xe6, 0x81, 0x73, 0xcf, 0x99, 0xdf,
0xf3, 0xfc, 0x3e, 0xce, 0xf9, 0x0d, 0xf0, 0xbf,
0x1d, 0x6c, 0x6d, 0x6d, 0x00, 0xc0, 0xd8, 0x71,
0xfb, 0xa1, 0xc7, 0x43, 0xbc, 0xa1, 0xa1, 0xa6,
0x06, 0x00, 0x52, 0xa9, 0xc1, 0x41, 0x4a, 0x29,
0x5d, 0x5c, 0xe4, 0xeb, 0x7e, 0xff, 0x1f, 0x2b,
0x80, 0x13, 0x54, 0x94, 0xaa, 0x2a, 0x00, 0x78,
0xf6, 0xec, 0xcc, 0x99, 0x68, 0x34, 0x1a, 0xb5,
0xd9, 0x2a, 0x2a, 0x42, 0xa1, 0x50, 0xc8, 0xe3,
0xa9, 0xad, 0x05, 0x80, 0x17, 0x2f, 0xfe, 0x58,
0x01, 0xbc, 0x58, 0xfa, 0xfa, 0x2c, 0x16, 0xaf,
0xd7, 0xeb, 0xcd, 0xe7, 0xfd, 0x7e, 0xa3, 0xd1,
0x68, 0x04, 0xa2, 0x51, 0x97, 0xcb, 0xe5, 0xa2,
0x54, 0x92, 0x24, 0x49, 0x92, 0x1c, 0x0e, 0x2e,
0xf4, 0xd2, 0xa5, 0xdf, 0xe6, 0xf7, 0xa8, 0x3f,
0xc0, 0x09, 0x39, 0x9d, 0x55, 0x55, 0x84, 0x10,
0x32, 0x32, 0xd2, 0xd2, 0x12, 0x8d, 0x46, 0xa3,
0x46, 0x23, 0x21, 0xd3, 0xd3, 0xd3, 0xd3, 0x00,
0xb0, 0xb9, 0xb9, 0xb9, 0x09, 0x58, 0xad, 0xaa,
0xaa, 0xaa, 0x8c, 0x65, 0xb3, 0xc9, 0x64, 0x32,
0x79, 0xf1, 0xa2, 0xd3, 0x09, 0x00, 0x77, 0xef,
0xbe, 0x7b, 0x07, 0x00, 0x9a, 0xf6, 0xab, 0xfe,
0x8f, 0x9c, 0x01, 0x51, 0x04, 0x80, 0x81, 0x81,
0xc2, 0x42, 0x9f, 0xcf, 0xe7, 0xd3, 0x34, 0x59,
0x5e, 0x5b, 0x5b, 0x5b, 0x03, 0x04, 0xa1, 0xb1,
0xb1, 0xb1, 0x11, 0xa0, 0xb4, 0xbe, 0xbe, 0xbe,
0x1e, 0xf0, 0x78, 0x14, 0x45, 0x51, 0x00, 0xb3,
0x59, 0x96, 0x65, 0x59, 0x96, 0x09, 0x01, 0x80,
0xab, 0x57, 0x8f, 0xea, 0x9f, 0x1c, 0x2d, 0xf2,
0x1e, 0x4f, 0x75, 0x35, 0x21, 0x84, 0x7c, 0xfc,
0xd8, 0xda, 0x1a, 0x8b, 0xc5, 0x62, 0xa2, 0x28,
0x49, 0x89, 0x44, 0x22, 0x01, 0x98, 0xcd, 0xa3,
0xa3, 0xa3, 0xa3, 0x00, 0x20, 0x49, 0x92, 0x04,
0x6c, 0x6c, 0x74, 0x74, 0x74, 0x74, 0x00, 0xeb,
0xeb, 0x1e, 0x8f, 0xc7, 0x03, 0x3c, 0x7d, 0x3a,
0x31, 0x31, 0x31, 0xb1, 0xb5, 0x35, 0x3b, 0xcb,
0x33, 0x38, 0x32, 0x02, 0x00, 0x5b, 0x5b, 0xff,
0x5a, 0x06, 0x4e, 0x9f, 0x06, 0x80, 0x27, 0x4f,
0x4e, 0x9c, 0xb0, 0xdb, 0xed, 0x76, 0x4a, 0x65,
0x39, 0x95, 0x4a, 0xa5, 0x00, 0x83, 0x21, 0x1e,
0x8f, 0xc7, 0x01, 0xc6, 0x5c, 0x2e, 0x97, 0x0b,
0x60, 0xcc, 0xe9, 0x74, 0x3a, 0x01, 0x49, 0x6a,
0x6d, 0x6d, 0x6d, 0x05, 0x9c, 0x4e, 0x42, 0x08,
0x01, 0x8a, 0x8b, 0x15, 0x45, 0x51, 0x04, 0x81,
0xf7, 0xce, 0xf5, 0xeb, 0x47, 0xcd, 0xc4, 0x4f,
0x46, 0x5e, 0x55, 0x6f, 0xde, 0xa4, 0x94, 0xd2,
0x2f, 0x5f, 0xa6, 0xa6, 0x9a, 0x9b, 0x9b, 0x9b,
0x35, 0xed, 0xe5, 0x4b, 0xb7, 0xdb, 0xed, 0xd6,
0xb4, 0xf7, 0xef, 0x13, 0x89, 0x44, 0x42, 0xd3,
0xcc, 0x66, 0xb3, 0xd9, 0x6c, 0xd6, 0x34, 0x9f,
0x8f, 0x97, 0xd6, 0x87, 0x0f, 0x33, 0x33, 0x33,
0x33, 0x9a, 0xf6, 0xea, 0x95, 0xaa, 0xaa, 0xaa,
0xa6, 0x4d, 0x4e, 0x36, 0x35, 0x35, 0x35, 0x69,
0xda, 0x8d, 0x1b, 0x00, 0x90, 0xcd, 0xf2, 0xdf,
0x75, 0x38, 0x8e, 0x3d, 0x03, 0xa7, 0x4e, 0x01,
0xc0, 0xe3, 0xc7, 0x5e, 0x6f, 0x20, 0x10, 0x08,
0x50, 0x2a, 0x8a, 0x4b, 0x4b, 0x4b, 0x4b, 0x80,
0x2c, 0x77, 0x77, 0x77, 0x77, 0x03, 0x94, 0x5a,
0x2c, 0x16, 0x0b, 0xa0, 0x28, 0x7a, 0xcd, 0x9b,
0xcd, 0x66, 0x33, 0x40, 0x69, 0x41, 0x41, 0x41,
0x01, 0x20, 0xcb, 0x9d, 0x9d, 0x9d, 0x9d, 0x40,
0x41, 0x01, 0x6f, 0xee, 0x8a, 0x0a, 0x9b, 0xcd,
0x66, 0xa3, 0x94, 0xf7, 0xd2, 0xed, 0xdb, 0xc7,
0x26, 0x80, 0x47, 0x28, 0x1c, 0xde, 0xd9, 0x61,
0x8c, 0x31, 0xbf, 0x3f, 0x1c, 0x2e, 0x2f, 0x2f,
0x2f, 0x67, 0x4c, 0xd3, 0x32, 0x99, 0x4c, 0x06,
0x30, 0x1a, 0x39, 0x31, 0xdd, 0x74, 0x01, 0x3a,
0x12, 0xc2, 0x4b, 0x47, 0x96, 0xbb, 0xba, 0xba,
0xba, 0x80, 0xed, 0xed, 0xd5, 0xd5, 0xd5, 0x55,
0xa0, 0xae, 0xae, 0xa1, 0xa1, 0xa1, 0x41, 0x10,
0x82, 0x41, 0x42, 0x08, 0xb9, 0x76, 0x8d, 0xfb,
0xa9, 0xa8, 0xf8, 0xed, 0x02, 0xc2, 0x61, 0x00,
0x18, 0x1d, 0x55, 0xd5, 0xca, 0xca, 0xca, 0x4a,
0xc6, 0x18, 0x4b, 0x26, 0x93, 0x49, 0x40, 0x96,
0x7b, 0x7b, 0x7b, 0x7b, 0x01, 0x42, 0x44, 0x51,
0x14, 0x77, 0x89, 0xea, 0x91, 0xb7, 0x58, 0x78,
0x46, 0xf4, 0x75, 0xc6, 0x0c, 0x06, 0x83, 0x01,
0x50, 0x94, 0x9e, 0x9e, 0x9e, 0x1e, 0x40, 0x10,
0x96, 0x97, 0x97, 0x97, 0x01, 0xbf, 0xdf, 0xe9,
0x74, 0x3a, 0x19, 0x33, 0x18, 0x00, 0xe0, 0xde,
0xbd, 0xdf, 0x26, 0x80, 0x47, 0xe4, 0xdc, 0x39,
0x40, 0x10, 0x04, 0xc1, 0xe3, 0xa9, 0xae, 0xe6,
0x0f, 0x13, 0x21, 0x26, 0x93, 0xc9, 0x04, 0x18,
0x8d, 0xbc, 0x39, 0x75, 0xdb, 0x2b, 0x60, 0xb7,
0x84, 0x28, 0xa5, 0x74, 0xf7, 0xbb, 0xc9, 0xd4,
0xde, 0xde, 0xde, 0x0e, 0xe4, 0xf3, 0xf9, 0x7c,
0x3e, 0x0f, 0x9c, 0x3d, 0x5b, 0x5f, 0x5f, 0x5f,
0x4f, 0x69, 0x30, 0xc8, 0x18, 0x63, 0x97, 0x2f,
0x73, 0xbf, 0xfc, 0xfd, 0xfe, 0x96, 0x7d, 0xf7,
0x1a, 0xbd, 0x75, 0x0b, 0x00, 0x3e, 0x7d, 0x3a,
0x79, 0xb2, 0xb6, 0xb6, 0xb6, 0xd6, 0xe5, 0x0a,
0x06, 0x79, 0xc9, 0x98, 0xcd, 0x43, 0x43, 0x43,
0x43, 0x80, 0x24, 0xd5, 0xd5, 0xd5, 0xd5, 0xed,
0x17, 0x90, 0x4e, 0xa7, 0xd3, 0xe9, 0x34, 0xbf,
0x44, 0x25, 0x09, 0x30, 0x1a, 0xf9, 0xcb, 0xac,
0x7f, 0xd7, 0x31, 0x9b, 0x1d, 0x1f, 0x1f, 0x1f,
0x07, 0xd6, 0xd7, 0x87, 0x87, 0x87, 0x87, 0x81,
0xd9, 0x59, 0xc6, 0x18, 0xcb, 0xe7, 0xdf, 0xbe,
0x4d, 0x24, 0x12, 0x89, 0xc5, 0xc5, 0xc1, 0x41,
0x00, 0xf0, 0xf9, 0x7e, 0x3a, 0x03, 0x3c, 0x02,
0x17, 0x2e, 0x50, 0x2a, 0x8a, 0xa2, 0x58, 0x58,
0x18, 0x0c, 0x16, 0x15, 0x15, 0x15, 0x01, 0x8c,
0xf9, 0x7c, 0x3e, 0xdf, 0xe1, 0xc4, 0x73, 0xb9,
0x5c, 0x2e, 0x97, 0x03, 0x62, 0xb1, 0x58, 0x2c,
0x16, 0x03, 0xe2, 0x71, 0x7e, 0xad, 0xee, 0x25,
0xae, 0x67, 0xc4, 0x64, 0x6a, 0x69, 0x69, 0x69,
0x01, 0x78, 0xb1, 0x01, 0xb5, 0xb5, 0x65, 0x65,
0x65, 0x65, 0x94, 0x72, 0xbf, 0x6e, 0x37, 0xe7,
0x71, 0xfe, 0xfc, 0x0f, 0x0b, 0xe0, 0x07, 0x08,
0xe1, 0xc9, 0x7b, 0xf0, 0xa0, 0xa6, 0x26, 0x14,
0x0a, 0x85, 0x44, 0x11, 0x58, 0x58, 0x58, 0x58,
0x00, 0x14, 0xa5, 0xaf, 0xaf, 0xaf, 0xef, 0x70,
0x42, 0x82, 0x20, 0x08, 0x82, 0x00, 0x94, 0x96,
0x96, 0x96, 0x96, 0x96, 0x02, 0x25, 0x25, 0x25,
0x25, 0x25, 0x25, 0xfb, 0xf7, 0xed, 0x3d, 0x6f,
0xb7, 0xf7, 0xf7, 0xf7, 0xf7, 0x03, 0xb9, 0xdc,
0xdc, 0xdc, 0xdc, 0x1c, 0x10, 0x89, 0x44, 0x22,
0x91, 0x88, 0x24, 0x71, 0x1e, 0x0f, 0x1f, 0x1e,
0x26, 0x40, 0x38, 0x78, 0x39, 0x1e, 0x37, 0x18,
0x24, 0x49, 0x92, 0x2c, 0x16, 0xaf, 0xd7, 0x66,
0xb3, 0xd9, 0x00, 0x51, 0x74, 0xbb, 0xdd, 0x6e,
0x40, 0x14, 0x03, 0x81, 0x40, 0xe0, 0x6f, 0x11,
0xd8, 0x43, 0x48, 0x17, 0x30, 0x36, 0x36, 0x36,
0x36, 0x36, 0x76, 0x38, 0xe1, 0xbd, 0x68, 0x32,
0xf1, 0x91, 0x63, 0x75, 0xd5, 0xe1, 0x70, 0x38,
0x00, 0x55, 0xe5, 0x0f, 0xe0, 0xeb, 0xd7, 0x46,
0xa3, 0xd1, 0x68, 0xb3, 0xb5, 0xb5, 0x65, 0x32,
0x99, 0xcc, 0x95, 0x2b, 0xfc, 0xc5, 0x7e, 0xf4,
0xe8, 0xd0, 0x1e, 0x18, 0x18, 0x00, 0x80, 0x54,
0x2a, 0x12, 0x09, 0x87, 0xc3, 0x61, 0xa7, 0xb3,
0xac, 0x8c, 0xdf, 0xd7, 0x9a, 0x36, 0x3f, 0x3f,
0x3f, 0x0f, 0x00, 0x9a, 0xf6, 0xeb, 0xa3, 0xd7,
0x8f, 0x9b, 0xc1, 0x50, 0x59, 0x59, 0x59, 0x09,
0x2c, 0x2d, 0x59, 0xad, 0x56, 0x2b, 0xf0, 0xfc,
0xf9, 0xd4, 0xd4, 0xd4, 0xd4, 0xca, 0xca, 0x9d,
0x3b, 0x00, 0x50, 0x5c, 0xfc, 0x8d, 0x0c, 0x10,
0x42, 0x88, 0x28, 0x12, 0xc2, 0x9b, 0x0e, 0xb0,
0xdb, 0xed, 0x76, 0x80, 0x31, 0x55, 0x55, 0xd5,
0xdd, 0x88, 0xed, 0xad, 0x7d, 0x7d, 0x6d, 0x6f,
0x64, 0xf7, 0xef, 0xfb, 0xf6, 0xfa, 0x6e, 0xc6,
0x78, 0xa0, 0xf2, 0xf9, 0x8d, 0x8d, 0x8d, 0x0d,
0x7d, 0xf7, 0xfe, 0x7f, 0x78, 0xfb, 0x04, 0xbc,
0x79, 0xa3, 0x69, 0x9a, 0xd6, 0xd3, 0xb3, 0xb3,
0x33, 0x39, 0x39, 0x39, 0x79, 0xff, 0xbe, 0xaa,
0x02, 0x80, 0xc9, 0x74, 0xfc, 0x31, 0x3f, 0xd8,
0x78, 0xd6, 0x37, 0x36, 0x66, 0x66, 0x80, 0x83,
0xa6, 0xd7, 0x9f, 0x9c, 0x46, 0xe9, 0xd7, 0xa6,
0xb7, 0x5a, 0xff, 0x89, 0x8a, 0xc2, 0x51, 0x17,
0xca, 0x9f, 0x23, 0x7d, 0xd8, 0xde, 0x3d, 0x97,
0xcf, 0x73, 0xdc, 0xde, 0xe6, 0x98, 0xcd, 0x72,
0x4c, 0xa7, 0x39, 0x7e, 0xfe, 0xcc, 0x71, 0x65,
0x85, 0xe3, 0xf7, 0xa7, 0xd3, 0x5f, 0x1e, 0xa7,
0xbf, 0x1e, 0xff, 0x7a, 0x9e, 0x17, 0xdb, 0x2e,
0xea, 0x02, 0x74, 0xd4, 0xf7, 0xe9, 0xc4, 0xbf,
0x7c, 0x39, 0x58, 0x40, 0x2e, 0x77, 0x34, 0x3e,
0xff, 0x41, 0xfb, 0x0b, 0xe8, 0x00, 0x80, 0xf8,
0x31, 0x40, 0x4e, 0x9f, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};

191
art/tango/document_new.h Normal file
View File

@@ -0,0 +1,191 @@
/* document_new.png - 477 bytes */
static const unsigned char document_new_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xfc, 0x00, 0xe9, 0x00, 0x4f, 0x34,
0xd7, 0xb1, 0x0d, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x02, 0x12, 0x0e, 0x26, 0x1c, 0xd3,
0xb6, 0x19, 0x29, 0x00, 0x00, 0x01, 0x6a, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x90, 0x4f,
0x4b, 0x5b, 0x51, 0x10, 0xc5, 0x7f, 0x73, 0xef,
0x8d, 0x56, 0x24, 0x7d, 0x25, 0x82, 0xd0, 0xca,
0x5b, 0x16, 0xdc, 0xd4, 0xee, 0x5c, 0x66, 0xa9,
0x1b, 0xf3, 0x0d, 0xb2, 0x71, 0x59, 0xbf, 0x45,
0xde, 0xb2, 0xdd, 0x77, 0x23, 0x04, 0xc4, 0x82,
0xdf, 0xc0, 0x4d, 0x37, 0xdd, 0x2a, 0x85, 0x52,
0x4a, 0xb2, 0x52, 0x4a, 0x49, 0x5a, 0x84, 0x10,
0xff, 0x45, 0x62, 0x9b, 0xde, 0x77, 0xc7, 0x85,
0x26, 0xc6, 0x18, 0x93, 0x54, 0x7a, 0x36, 0x33,
0x0c, 0x73, 0xe6, 0x9c, 0x33, 0x52, 0x2e, 0x97,
0xb7, 0x6b, 0xb5, 0x5a, 0x91, 0x11, 0x98, 0x9d,
0xfd, 0xcb, 0xdc, 0x5c, 0x9b, 0x67, 0xd1, 0x6f,
0xf2, 0xcb, 0x9f, 0xdf, 0xe5, 0xa2, 0x6f, 0x1f,
0xe1, 0xcf, 0xbe, 0x64, 0xc3, 0x19, 0xa5, 0x52,
0x49, 0xc7, 0xe1, 0xfc, 0x78, 0x53, 0x2f, 0x4f,
0xdf, 0x68, 0xe7, 0xbc, 0xa0, 0x97, 0x27, 0x2b,
0x9d, 0x8b, 0xc6, 0xe2, 0xae, 0xb6, 0xb2, 0xeb,
0xda, 0x32, 0x33, 0xae, 0xab, 0xd2, 0x6c, 0x36,
0x09, 0x21, 0x00, 0x20, 0x22, 0x3d, 0xf5, 0x8c,
0xd9, 0x63, 0xda, 0x7e, 0x21, 0xe3, 0xbe, 0x22,
0x66, 0x09, 0xeb, 0x4c, 0x26, 0xd8, 0xf6, 0x6a,
0xc7, 0xb7, 0x5b, 0x53, 0xce, 0x57, 0x7b, 0x07,
0x06, 0xc9, 0xdd, 0x6a, 0xe4, 0x08, 0x6b, 0xea,
0x88, 0x79, 0x85, 0xb8, 0x02, 0x60, 0x31, 0x2a,
0x46, 0xd3, 0x5f, 0x8b, 0xe0, 0x5e, 0xba, 0xfe,
0xac, 0x83, 0xe4, 0xeb, 0x5e, 0x6f, 0x3a, 0x0b,
0x4c, 0x81, 0x38, 0x10, 0x0b, 0x82, 0x00, 0x17,
0x6e, 0x34, 0x59, 0x08, 0x3a, 0x4f, 0xd0, 0xe7,
0xd8, 0x50, 0x45, 0xd3, 0x69, 0x40, 0xd0, 0xb4,
0xa2, 0xde, 0x9b, 0x7a, 0xc6, 0xa6, 0x15, 0xf7,
0xd0, 0xe7, 0xbb, 0x87, 0x02, 0xaf, 0xf1, 0xe1,
0x27, 0xe0, 0xb1, 0x5a, 0x01, 0x14, 0xef, 0x5f,
0xe8, 0xe9, 0x59, 0xeb, 0xd3, 0xcc, 0xfc, 0xf7,
0x83, 0x91, 0x11, 0x44, 0x04, 0xe5, 0x29, 0x1d,
0x5d, 0x43, 0x75, 0x81, 0x34, 0xfd, 0x01, 0x3c,
0x61, 0x6b, 0xe7, 0xd0, 0x6c, 0x6c, 0x6c, 0xbf,
0x05, 0x70, 0xa3, 0xc8, 0xb7, 0x35, 0x8b, 0xd7,
0x3c, 0x22, 0x42, 0x14, 0x45, 0x34, 0x1a, 0x49,
0x4f, 0xd4, 0x30, 0x21, 0xfa, 0x7f, 0xd3, 0x8f,
0x7b, 0x11, 0x86, 0x39, 0x78, 0x88, 0x7c, 0xc7,
0xc1, 0xb0, 0xa5, 0xc1, 0xd9, 0xb0, 0x1d, 0x33,
0xa9, 0xdd, 0xb1, 0x11, 0x72, 0xb9, 0x1c, 0x8f,
0x81, 0x8b, 0xe3, 0xf8, 0x43, 0x92, 0x24, 0xc5,
0x7f, 0x21, 0xc5, 0x71, 0xfc, 0x9e, 0xff, 0x85,
0x2b, 0xcc, 0x3d, 0x99, 0x60, 0x7b, 0xac, 0x14,
0xc9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};
/* document_new.png - 999 bytes */
static const unsigned char document_new_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xfc, 0x00, 0xe9, 0x00, 0x4f, 0x34,
0xd7, 0xb1, 0x0d, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x03,
0x72, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
0x57, 0xcf, 0x4f, 0x13, 0x41, 0x14, 0xfe, 0xde,
0x4c, 0xb7, 0x84, 0x12, 0x95, 0x50, 0x68, 0x6d,
0x4c, 0x3c, 0x79, 0x30, 0xc4, 0x93, 0x89, 0x11,
0x48, 0xf8, 0x07, 0xb8, 0x70, 0xe0, 0xc4, 0xcd,
0x78, 0xe5, 0x4c, 0x48, 0x8c, 0x5c, 0x8c, 0x1a,
0x7f, 0xfc, 0x13, 0x1e, 0xb8, 0x18, 0x0f, 0x86,
0xbb, 0xc1, 0x90, 0x90, 0x00, 0x25, 0x5c, 0x20,
0xc0, 0x09, 0x7a, 0x81, 0xa6, 0xd0, 0x84, 0x10,
0x52, 0x6b, 0xdb, 0xc5, 0x79, 0x1e, 0x9e, 0xe3,
0xee, 0x4e, 0xbb, 0xd8, 0x4a, 0xd5, 0xf8, 0x92,
0xed, 0xec, 0xfc, 0xd8, 0x99, 0xef, 0x7b, 0xef,
0x7b, 0x6f, 0xbb, 0xc0, 0x7f, 0x6e, 0xf4, 0xaf,
0x01, 0x58, 0xbb, 0xb8, 0x38, 0x3e, 0x9e, 0x9c,
0xa4, 0x1f, 0x78, 0x3c, 0x4f, 0x5a, 0xdf, 0x4f,
0x24, 0xb2, 0xd9, 0xc5, 0x45, 0xe6, 0x8e, 0x09,
0xbc, 0x7a, 0xf5, 0xe6, 0xcd, 0x8b, 0x17, 0xcf,
0x9e, 0x49, 0x6f, 0x7e, 0xfe, 0x4f, 0x01, 0x57,
0x8a, 0xc8, 0x18, 0x20, 0x9d, 0xee, 0xef, 0xaf,
0xd5, 0x80, 0x5c, 0x6e, 0x68, 0xa8, 0x52, 0x01,
0xb4, 0x56, 0x8a, 0x19, 0xa8, 0xd7, 0x1b, 0x0d,
0xa5, 0xde, 0xbd, 0x9b, 0x98, 0x18, 0x1f, 0x2f,
0x14, 0x66, 0x66, 0x84, 0x50, 0xb5, 0x6a, 0x9f,
0x4f, 0x5c, 0xbe, 0xfd, 0xfc, 0xfc, 0xdc, 0xdc,
0xec, 0xec, 0x93, 0x27, 0xdd, 0x07, 0xce, 0xcc,
0xec, 0xfb, 0xe2, 0xe5, 0xdd, 0x5d, 0xc0, 0x98,
0x6a, 0x75, 0x69, 0x09, 0xf0, 0x7d, 0xe6, 0x74,
0x1a, 0x60, 0x06, 0x52, 0x29, 0xe0, 0xf4, 0xf4,
0xe4, 0x64, 0x6f, 0xef, 0xd1, 0x23, 0x66, 0x40,
0xeb, 0xcf, 0x9f, 0x25, 0x52, 0xef, 0xdf, 0x0b,
0x91, 0x7a, 0x3d, 0xd1, 0xee, 0x81, 0x85, 0x42,
0xa1, 0x50, 0x28, 0x00, 0x5a, 0x6b, 0xad, 0xb5,
0x00, 0x60, 0x06, 0x88, 0x88, 0x88, 0x82, 0xd6,
0x5a, 0xdc, 0xb8, 0x80, 0x07, 0x3c, 0x8f, 0xa8,
0x58, 0x04, 0x52, 0x29, 0xa5, 0x3e, 0x7d, 0x02,
0xb4, 0xf6, 0xbc, 0xde, 0x5e, 0x80, 0x39, 0x99,
0x9c, 0x9a, 0x02, 0x88, 0xb4, 0x1e, 0x18, 0x00,
0xae, 0x5f, 0x1f, 0x1c, 0x5c, 0x5e, 0x06, 0x98,
0x8d, 0xf9, 0xf0, 0x61, 0x7a, 0x9a, 0x88, 0xf9,
0xec, 0x6c, 0x73, 0x53, 0x76, 0xda, 0xd9, 0x51,
0xed, 0x12, 0x70, 0x01, 0xb9, 0xc0, 0x2c, 0x21,
0xb9, 0x0b, 0xfa, 0xcc, 0xc6, 0xd8, 0xbe, 0x5d,
0xfb, 0xed, 0x9b, 0x48, 0xa7, 0x52, 0x91, 0x7d,
0xea, 0x75, 0x80, 0x99, 0x68, 0x70, 0x50, 0x44,
0x35, 0x30, 0x60, 0xe5, 0x25, 0x6d, 0x4f, 0x8f,
0x7d, 0x2e, 0x95, 0x92, 0xbb, 0x1b, 0x37, 0x7e,
0x4a, 0xb0, 0x5b, 0x04, 0x00, 0xdb, 0x73, 0xd7,
0x29, 0x45, 0x04, 0x28, 0x25, 0x70, 0x88, 0x88,
0xb4, 0x06, 0x8c, 0x21, 0xba, 0x76, 0x0d, 0x30,
0x06, 0x18, 0x1a, 0x02, 0x88, 0x2e, 0x2e, 0x0e,
0x0e, 0x44, 0x52, 0x2b, 0x2b, 0x00, 0x60, 0xcc,
0xf1, 0x31, 0xd0, 0x68, 0xd4, 0x6a, 0xf9, 0x3c,
0x40, 0xc4, 0xfc, 0xe5, 0xcb, 0xf6, 0xb6, 0x9c,
0x71, 0x7a, 0x7a, 0x65, 0x02, 0x4a, 0x09, 0xa4,
0xa0, 0x1f, 0xcc, 0x87, 0xc7, 0x03, 0xa2, 0x32,
0xae, 0x94, 0x25, 0x00, 0xdc, 0xbc, 0x09, 0xd4,
0x6a, 0xc0, 0xe8, 0x28, 0xd0, 0x68, 0x30, 0xdf,
0xb9, 0x03, 0x00, 0x8d, 0xc6, 0xc6, 0x06, 0x90,
0x48, 0xf8, 0xfe, 0xc7, 0x8f, 0xc0, 0xc1, 0xc1,
0xfe, 0xfe, 0xe1, 0xa1, 0xb8, 0xc7, 0x98, 0x85,
0x05, 0x41, 0x53, 0x2c, 0x5a, 0x5c, 0x6d, 0xe7,
0x80, 0x0b, 0xbc, 0x39, 0x07, 0x6c, 0x0c, 0xec,
0x6f, 0x73, 0xa4, 0xa4, 0x95, 0x88, 0x10, 0x01,
0xc9, 0xa4, 0x48, 0xe7, 0xd6, 0x2d, 0xc0, 0xf7,
0x81, 0x74, 0x5a, 0xe4, 0x35, 0x3c, 0x0c, 0xf4,
0xf6, 0xf6, 0xf5, 0x79, 0x1e, 0x90, 0xcf, 0x6f,
0x6f, 0x9f, 0x9f, 0x03, 0xf7, 0xef, 0xdf, 0xbd,
0x5b, 0x2c, 0x6e, 0x6d, 0xc9, 0x4e, 0x5f, 0xbf,
0x76, 0x1c, 0x81, 0x8d, 0x8d, 0xcd, 0xcd, 0x7c,
0x3e, 0x3e, 0x22, 0x56, 0x3a, 0x6e, 0x64, 0x9a,
0x5b, 0x7b, 0x05, 0x91, 0x92, 0xa2, 0xa0, 0x54,
0x5f, 0x1f, 0xc0, 0xac, 0xf5, 0xed, 0xdb, 0x00,
0x51, 0x32, 0x79, 0xef, 0x1e, 0x50, 0xa9, 0x54,
0xab, 0x9e, 0x07, 0xd8, 0xf2, 0xe9, 0xbe, 0x17,
0xda, 0x26, 0xf0, 0xf0, 0xe1, 0x83, 0x07, 0x23,
0x23, 0x40, 0x2e, 0x97, 0xcb, 0xe5, 0x72, 0x97,
0x6b, 0xdc, 0xb6, 0x51, 0x22, 0xd6, 0xf3, 0x61,
0xba, 0x51, 0x09, 0xca, 0xfa, 0x20, 0x9b, 0xdc,
0xec, 0x6a, 0x65, 0x1d, 0x4b, 0xa8, 0x54, 0x2a,
0x95, 0x4a, 0xa5, 0xf0, 0xc1, 0xcc, 0x16, 0xba,
0xfd, 0x75, 0xa5, 0x12, 0x7e, 0x3e, 0x48, 0xf2,
0x60, 0x3c, 0x0a, 0xf4, 0x32, 0xb8, 0x5d, 0x20,
0xe0, 0xb6, 0xcc, 0x44, 0x36, 0x17, 0x5c, 0x40,
0xad, 0xa5, 0x16, 0x47, 0xc8, 0x3a, 0xa4, 0x13,
0xf8, 0x1d, 0x10, 0x68, 0x3e, 0x58, 0xcc, 0x56,
0x9f, 0xb0, 0xf7, 0xa3, 0x52, 0x91, 0x48, 0x04,
0xf3, 0xee, 0xfa, 0xa8, 0xdf, 0xc3, 0xeb, 0xdb,
0xb1, 0xb6, 0xf9, 0xae, 0xad, 0xad, 0xaf, 0xaf,
0xae, 0xfe, 0xda, 0x83, 0xc1, 0x78, 0x6b, 0xe0,
0x71, 0x39, 0x40, 0xe4, 0x66, 0x51, 0x97, 0x09,
0x8c, 0x8e, 0x8e, 0x8c, 0x8c, 0x8d, 0x01, 0x99,
0x4c, 0x26, 0x93, 0xc9, 0xb4, 0xaa, 0xff, 0x56,
0xf3, 0x36, 0xa9, 0xe5, 0x0a, 0x27, 0xaf, 0x8d,
0x8e, 0xcc, 0xb9, 0xe3, 0xd1, 0xf9, 0x76, 0xad,
0xe3, 0x1c, 0x28, 0x97, 0xcb, 0xe5, 0x72, 0x39,
0xbe, 0x8c, 0xba, 0x11, 0x89, 0xee, 0xd1, 0x4c,
0x28, 0x2e, 0xa2, 0x5d, 0x27, 0x70, 0x19, 0x35,
0x5b, 0x2e, 0xdd, 0xe3, 0xa3, 0x80, 0xc3, 0x50,
0x5b, 0xad, 0x0b, 0xbf, 0x02, 0xff, 0x20, 0x81,
0x66, 0xcf, 0x05, 0x00, 0x5d, 0x60, 0xd1, 0xb8,
0x34, 0x03, 0x0d, 0xef, 0x47, 0xc4, 0x1c, 0x9d,
0xff, 0x4b, 0x11, 0x68, 0xae, 0x22, 0xee, 0x5f,
0x0b, 0xb7, 0xda, 0x44, 0x81, 0x87, 0x23, 0x15,
0xdd, 0xb1, 0xcb, 0x04, 0xb2, 0xd9, 0x6c, 0x36,
0x9b, 0xbd, 0x2a, 0xdd, 0xee, 0x5b, 0x2c, 0x01,
0x63, 0x8c, 0x31, 0xe6, 0xf9, 0xf3, 0xd7, 0xaf,
0xdf, 0xbe, 0x7d, 0xf9, 0xf2, 0xe9, 0xd3, 0x7f,
0x05, 0xf0, 0xe8, 0xe8, 0xf0, 0xb0, 0x58, 0x7c,
0xfc, 0x38, 0x6e, 0xfe, 0x37, 0x3f, 0xea, 0x3b,
0x7b, 0xdd, 0x5f, 0xdd, 0xe2, 0x3f, 0xea, 0xff,
0x7b, 0xfb, 0x0e, 0x30, 0x0d, 0x2c, 0x47, 0xc0,
0x05, 0x25, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};

274
art/tango/document_open.h Normal file
View File

@@ -0,0 +1,274 @@
/* document_open.png - 537 bytes */
static const unsigned char document_open_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0b, 0x15, 0x11, 0x32, 0x0d, 0x10,
0x15, 0x50, 0x0b, 0x00, 0x00, 0x01, 0xa6, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x91, 0xbf,
0x4f, 0x53, 0x51, 0x14, 0xc7, 0x3f, 0x2f, 0x7d,
0xa8, 0xef, 0xd1, 0x06, 0x0b, 0x0c, 0x4d, 0x4c,
0x37, 0x19, 0x60, 0x73, 0x42, 0x13, 0x23, 0x03,
0x83, 0x7f, 0x00, 0x08, 0x46, 0x06, 0x24, 0x0c,
0x12, 0x10, 0x1c, 0xdc, 0x0c, 0x04, 0x06, 0x17,
0x07, 0x16, 0x36, 0x13, 0x7e, 0x0e, 0x04, 0xd4,
0x30, 0x03, 0xd1, 0x41, 0x47, 0x06, 0x13, 0x12,
0x0c, 0x6c, 0x84, 0x68, 0x4c, 0x84, 0x26, 0x6d,
0x6d, 0xe0, 0xbd, 0xe7, 0xed, 0xbb, 0xf7, 0x38,
0xb4, 0x69, 0xad, 0x79, 0x4d, 0x31, 0x7e, 0x72,
0x93, 0x7b, 0x4f, 0xce, 0x3d, 0xdf, 0xf3, 0xbd,
0xe7, 0x5a, 0x0f, 0x06, 0xfb, 0x66, 0x53, 0xa9,
0xd4, 0x1c, 0x7f, 0xa1, 0x94, 0x2a, 0xed, 0xbf,
0xd4, 0xd8, 0xca, 0xf2, 0xda, 0x6b, 0xea, 0x60,
0x4d, 0x3e, 0x9b, 0x90, 0x91, 0xe1, 0xd1, 0xc8,
0x64, 0x10, 0xf8, 0x2c, 0xad, 0x2c, 0x52, 0x28,
0x14, 0x1e, 0xbd, 0x7b, 0xb3, 0xb5, 0x11, 0x29,
0x30, 0xfe, 0x74, 0x4c, 0x06, 0xfa, 0x07, 0x39,
0x3c, 0x3a, 0x04, 0xc0, 0x6e, 0x8a, 0x91, 0x48,
0xc4, 0x69, 0x44, 0x2e, 0x9f, 0x7d, 0x39, 0xfe,
0x64, 0x6a, 0xc6, 0xd6, 0x5a, 0xe3, 0x38, 0x2e,
0xd7, 0x5b, 0x92, 0x25, 0xc5, 0x98, 0xe1, 0xe1,
0xc0, 0x50, 0x43, 0x81, 0xcd, 0xb7, 0xeb, 0xd3,
0xc0, 0x8c, 0xad, 0x94, 0xc2, 0xf7, 0x3d, 0xf2,
0x3f, 0x73, 0x00, 0x24, 0x5b, 0x5b, 0x00, 0xf0,
0xbc, 0x8b, 0xba, 0xc5, 0xae, 0xdb, 0x5c, 0x39,
0xdb, 0x61, 0x18, 0xd6, 0x38, 0x00, 0x53, 0x49,
0x1e, 0x95, 0x9f, 0xf5, 0x27, 0x9d, 0x9d, 0x5d,
0x35, 0xb1, 0x0d, 0x44, 0x3a, 0x88, 0xba, 0x1c,
0xc5, 0xa5, 0x1d, 0xc4, 0xe3, 0x09, 0xd2, 0xe9,
0x74, 0xb4, 0x80, 0xef, 0x7b, 0xbc, 0xff, 0x72,
0xce, 0x41, 0xc6, 0x05, 0x60, 0xfe, 0xc3, 0x7a,
0x9d, 0x7e, 0x9f, 0x6b, 0xa2, 0xde, 0x89, 0x25,
0xb1, 0x01, 0x1c, 0xc7, 0xe5, 0x20, 0xe3, 0xb2,
0xf0, 0xfc, 0x3e, 0x81, 0xd2, 0x5c, 0x86, 0x6b,
0x57, 0x62, 0x4c, 0xcd, 0xef, 0x56, 0x67, 0x00,
0xf0, 0x23, 0x17, 0x70, 0x7c, 0x76, 0xd1, 0xb0,
0x58, 0x6b, 0x43, 0xba, 0xdd, 0xad, 0x0e, 0xd1,
0x71, 0x4a, 0x81, 0x00, 0x22, 0x82, 0x65, 0x59,
0x88, 0x08, 0x22, 0x60, 0x44, 0xd0, 0x46, 0x08,
0xb5, 0x50, 0xd4, 0x06, 0x15, 0x1a, 0x42, 0x2d,
0xb4, 0x25, 0xae, 0xd6, 0xfe, 0xc2, 0xcd, 0xa4,
0x4f, 0xf6, 0x5c, 0xf1, 0x3d, 0xeb, 0x83, 0x58,
0x18, 0x84, 0xf2, 0x42, 0x04, 0x04, 0x41, 0xa4,
0x2c, 0x0c, 0x04, 0x45, 0x53, 0x15, 0x38, 0xcd,
0x9c, 0x71, 0xeb, 0xce, 0x5d, 0xf6, 0x4f, 0xf2,
0xe5, 0xa2, 0x52, 0x77, 0x11, 0x30, 0x08, 0x82,
0x05, 0x22, 0x15, 0x57, 0xdd, 0x1d, 0xad, 0xec,
0x6e, 0xef, 0x90, 0x0c, 0xbe, 0xad, 0x5a, 0xf7,
0x1e, 0xbf, 0xfa, 0xe8, 0x35, 0xdd, 0xe8, 0xe1,
0x1f, 0x69, 0x2e, 0x7e, 0xdd, 0xfb, 0xb4, 0xfa,
0xe2, 0x36, 0xff, 0xcb, 0x6f, 0x37, 0x66, 0xca,
0x8b, 0x19, 0x6f, 0x71, 0x8b, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82};
/* document_open.png - 1596 bytes */
static const unsigned char document_open_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
0xc7, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x56, 0x4d, 0x4c, 0x13, 0x5b, 0x14, 0xfe, 0x66,
0x5a, 0xe8, 0x74, 0xa6, 0xa5, 0x94, 0xc2, 0x00,
0xa5, 0xa0, 0x08, 0x51, 0x94, 0xbf, 0x18, 0x34,
0x28, 0x9a, 0x98, 0x98, 0xb8, 0x35, 0x31, 0x0f,
0x35, 0x2e, 0x48, 0x4c, 0x8c, 0x6b, 0x35, 0x1a,
0x77, 0x6a, 0xa2, 0x6e, 0x95, 0x9d, 0x0b, 0x5d,
0x90, 0xa0, 0xa0, 0x84, 0x9f, 0xc4, 0x44, 0x16,
0x24, 0xba, 0x70, 0x61, 0x64, 0x21, 0x7f, 0x15,
0x2a, 0x7f, 0x5a, 0x08, 0xa4, 0x2d, 0x50, 0x6a,
0x99, 0xb6, 0x40, 0x3b, 0x7f, 0x6f, 0x71, 0x33,
0x4e, 0x5b, 0x40, 0x14, 0xf5, 0xbd, 0xbc, 0xe4,
0x7d, 0x49, 0x7b, 0x67, 0xee, 0xdc, 0x33, 0x73,
0xbe, 0x73, 0xbe, 0x7b, 0xcf, 0x01, 0xfe, 0xe3,
0xa0, 0x76, 0x6a, 0xd8, 0xda, 0xfa, 0xec, 0x59,
0x4b, 0xcb, 0xb9, 0x73, 0x00, 0x45, 0x01, 0x1d,
0x1d, 0xb2, 0x2c, 0x49, 0xb2, 0x0c, 0xa8, 0x2a,
0xf9, 0xed, 0xd8, 0x21, 0x8a, 0xfc, 0xb4, 0xf7,
0xa8, 0xaa, 0xaa, 0x02, 0xf7, 0xef, 0x5f, 0xba,
0x74, 0xf1, 0xe2, 0xe5, 0xcb, 0xb7, 0x6e, 0xfd,
0x36, 0xe6, 0x9d, 0x9d, 0x3d, 0x3d, 0xcf, 0x9f,
0xab, 0x7f, 0x0c, 0x82, 0x20, 0x08, 0x82, 0xa0,
0xaa, 0xad, 0xad, 0x6d, 0x6d, 0x2d, 0x2d, 0x5b,
0x87, 0xc4, 0xa8, 0x5d, 0x34, 0x35, 0x35, 0x35,
0x35, 0x35, 0xd5, 0xd5, 0x29, 0x0a, 0x20, 0xcb,
0xbd, 0xbd, 0x14, 0x45, 0x51, 0x34, 0x9d, 0x1c,
0x17, 0xf2, 0xcf, 0xb2, 0x2c, 0x6b, 0x36, 0xd3,
0xb4, 0x24, 0x89, 0xa2, 0x2c, 0xeb, 0x2f, 0x92,
0x65, 0x59, 0x96, 0xa4, 0xe4, 0xd5, 0x3f, 0x07,
0x45, 0x51, 0x14, 0x45, 0xd1, 0xef, 0x25, 0x49,
0x92, 0x44, 0x11, 0xc8, 0xcc, 0xcc, 0xcc, 0xcc,
0xcc, 0xdc, 0xda, 0xee, 0x1b, 0x01, 0x41, 0x10,
0x84, 0x70, 0xf8, 0xf1, 0xe3, 0x2b, 0x57, 0xae,
0x5e, 0xbd, 0x76, 0x2d, 0x3f, 0x7f, 0x2b, 0x83,
0x85, 0x85, 0xc5, 0x45, 0xbf, 0x1f, 0x70, 0x3a,
0x9d, 0xce, 0xa2, 0x22, 0x7d, 0x7e, 0x68, 0x68,
0x68, 0x68, 0x68, 0x08, 0xf0, 0xf9, 0xfc, 0x7e,
0xbf, 0x1f, 0xa0, 0x69, 0x8a, 0xd2, 0x69, 0x03,
0x9b, 0x09, 0x2b, 0xf9, 0x89, 0xa2, 0x10, 0xb1,
0xd8, 0xed, 0x76, 0x7b, 0x76, 0x36, 0x50, 0x55,
0x55, 0x59, 0x59, 0x55, 0xb5, 0x91, 0xd8, 0x96,
0x04, 0x14, 0x05, 0x50, 0x55, 0x49, 0x8a, 0x46,
0xa3, 0xd1, 0x68, 0x14, 0x18, 0x1c, 0x1c, 0x18,
0x18, 0x18, 0xd0, 0x17, 0xb2, 0x2c, 0xc7, 0xb1,
0x2c, 0xe0, 0x72, 0x95, 0x94, 0x38, 0x9d, 0x40,
0x43, 0xc3, 0x91, 0x23, 0xc7, 0x8e, 0x01, 0xe1,
0x70, 0x38, 0x1c, 0x0a, 0x01, 0xe5, 0xe5, 0xe5,
0xe5, 0xe5, 0xe5, 0x40, 0x45, 0x45, 0x45, 0xc5,
0xbe, 0x7d, 0x00, 0x4d, 0xd3, 0xb4, 0xc1, 0x90,
0xec, 0xa0, 0xa2, 0x68, 0x9a, 0xd6, 0xa8, 0x24,
0xcf, 0x6b, 0xf7, 0x46, 0xa3, 0xd1, 0x68, 0x34,
0x92, 0x40, 0x04, 0x02, 0x24, 0x13, 0x5a, 0x66,
0xb7, 0x21, 0x20, 0xcb, 0x8a, 0xb2, 0xb2, 0x62,
0x32, 0x31, 0x8c, 0xcd, 0x06, 0x38, 0x1c, 0x0e,
0x47, 0x6e, 0xae, 0xbe, 0xd0, 0xe1, 0xe0, 0xf9,
0xec, 0x6c, 0xa0, 0xa1, 0xa1, 0xbe, 0xfe, 0xf8,
0x71, 0x20, 0x16, 0x8b, 0xc5, 0x62, 0x31, 0x60,
0x76, 0x76, 0x76, 0x76, 0x76, 0x16, 0xf8, 0xf0,
0x81, 0x10, 0x66, 0x18, 0xb3, 0xd9, 0x6c, 0xde,
0x3c, 0xca, 0x9a, 0x34, 0x92, 0x1d, 0x32, 0x99,
0x88, 0x44, 0x76, 0xed, 0x2a, 0x29, 0x29, 0x29,
0x01, 0x2a, 0x2b, 0x49, 0xe4, 0x17, 0x17, 0x97,
0x96, 0x02, 0x01, 0xc0, 0x62, 0xb1, 0x58, 0x2c,
0x96, 0x1f, 0x20, 0x40, 0xd3, 0x06, 0x03, 0x45,
0x71, 0x5c, 0x22, 0xb1, 0xbe, 0x2e, 0x08, 0xa2,
0xc8, 0x30, 0x0c, 0xc3, 0x30, 0x19, 0x19, 0xda,
0x8b, 0xb2, 0xb2, 0xec, 0x76, 0x8e, 0x03, 0xcc,
0x66, 0xe2, 0xa0, 0xd7, 0xeb, 0xf5, 0x4e, 0x4f,
0x03, 0xa2, 0x48, 0x1c, 0xaa, 0xae, 0xae, 0xa9,
0xa9, 0xaa, 0x02, 0x28, 0x4a, 0x55, 0x93, 0xf7,
0x00, 0x45, 0xd1, 0x34, 0x39, 0x55, 0x48, 0xa4,
0xb5, 0x9d, 0x45, 0x51, 0x44, 0x62, 0x8a, 0x22,
0xcb, 0xaa, 0x0a, 0xf0, 0x7c, 0x7e, 0x7e, 0x41,
0x01, 0x30, 0x3e, 0x3e, 0x31, 0x31, 0x31, 0x41,
0xc6, 0xf1, 0x71, 0x12, 0xc8, 0x9c, 0x9c, 0x07,
0x0f, 0xb6, 0x25, 0x40, 0x1c, 0x76, 0xbb, 0xfd,
0xfe, 0x40, 0xc0, 0xe7, 0x3b, 0x7c, 0x98, 0x65,
0xcd, 0x66, 0x8e, 0x03, 0x38, 0x8e, 0x44, 0xe0,
0xe4, 0xc9, 0x13, 0x27, 0x4e, 0x9d, 0x02, 0x82,
0xc1, 0x60, 0x70, 0x69, 0x09, 0xf8, 0xf2, 0xc5,
0xeb, 0x9d, 0x99, 0x01, 0x22, 0x91, 0x68, 0x34,
0x12, 0xd1, 0x63, 0xac, 0x1f, 0xa3, 0x44, 0xbb,
0x5a, 0xe4, 0x75, 0x52, 0x84, 0x90, 0xd1, 0x68,
0x34, 0x1a, 0x0c, 0x80, 0xd9, 0xcc, 0x30, 0x66,
0x33, 0xc0, 0xf3, 0x3c, 0xcf, 0xf3, 0xc0, 0xc7,
0x8f, 0x63, 0x63, 0x23, 0x23, 0x40, 0x4e, 0x4e,
0x4e, 0x8e, 0xdd, 0xfe, 0xf0, 0xe1, 0x99, 0x33,
0xa7, 0x4f, 0x37, 0x36, 0xde, 0xb8, 0xb1, 0x15,
0x81, 0x6f, 0xaf, 0x3d, 0x7b, 0xf6, 0xfc, 0xf9,
0xbf, 0xfe, 0xba, 0x79, 0xb3, 0xb6, 0xb6, 0xa6,
0xa6, 0xb6, 0xf6, 0xce, 0x1d, 0x97, 0xcb, 0xe5,
0x2a, 0x2e, 0x66, 0x59, 0x86, 0x61, 0xd9, 0x8c,
0x0c, 0x20, 0x3b, 0xdb, 0x6e, 0x2f, 0x2c, 0x04,
0xda, 0xdb, 0xfb, 0xfa, 0xdc, 0x6e, 0xc0, 0xe3,
0x09, 0x87, 0xf3, 0xf2, 0xb0, 0x63, 0x30, 0x8c,
0xc1, 0x90, 0x7c, 0x8a, 0xad, 0xaf, 0xcb, 0xb2,
0xb6, 0x67, 0xbe, 0x87, 0xbd, 0x7b, 0x2d, 0x96,
0x85, 0x85, 0xfe, 0xfe, 0xf6, 0xf6, 0xe6, 0xe6,
0xeb, 0xd7, 0x8f, 0x1e, 0x35, 0xa6, 0x3e, 0x9e,
0x99, 0x09, 0x85, 0x42, 0xa1, 0xaf, 0x5f, 0x45,
0xb1, 0xb4, 0xb4, 0xac, 0x6c, 0xf7, 0x6e, 0xe0,
0xe0, 0xc1, 0x9a, 0x9a, 0x43, 0x87, 0x80, 0xee,
0xee, 0x97, 0x2f, 0x7b, 0x7b, 0x81, 0xa6, 0xa6,
0x0b, 0x17, 0x48, 0xf9, 0xd2, 0x4e, 0x19, 0x5d,
0x2c, 0xda, 0x3d, 0x29, 0x46, 0xe4, 0x5e, 0x1b,
0x93, 0x37, 0x6f, 0xb2, 0x84, 0x7e, 0x16, 0xcd,
0xcd, 0x4f, 0x9e, 0x74, 0x75, 0xed, 0xdf, 0xbf,
0x41, 0x42, 0x04, 0xa1, 0x50, 0x3c, 0x1e, 0x8f,
0x27, 0x12, 0xa2, 0x28, 0xcb, 0xb2, 0x2c, 0xcb,
0x80, 0xd5, 0x6a, 0xb5, 0x5a, 0xad, 0x40, 0x7f,
0xff, 0xdc, 0x1c, 0xc3, 0x00, 0xd5, 0xd5, 0x89,
0x84, 0xa2, 0x00, 0x1e, 0x8f, 0xcf, 0x17, 0x8b,
0xed, 0x3c, 0x03, 0x3f, 0x0b, 0xa7, 0xd3, 0x6e,
0x67, 0x18, 0x20, 0x1a, 0x8d, 0xc7, 0x55, 0x55,
0x3f, 0x06, 0xe8, 0xd4, 0x65, 0x63, 0x63, 0xc1,
0x60, 0x30, 0xb8, 0xb8, 0x28, 0x8a, 0xb2, 0x4c,
0x36, 0xa7, 0xcf, 0x17, 0x08, 0xf8, 0x7c, 0x40,
0x66, 0xa6, 0xc1, 0xa0, 0x69, 0xfa, 0x57, 0x5a,
0x85, 0x9d, 0x42, 0x10, 0x42, 0xa1, 0xe5, 0x65,
0x55, 0x5d, 0x5f, 0x97, 0x24, 0x83, 0x61, 0x7e,
0x7e, 0x03, 0x81, 0xce, 0xce, 0x8e, 0x8e, 0xee,
0x6e, 0xbf, 0x9f, 0x61, 0x18, 0xc6, 0x6c, 0x56,
0x55, 0xab, 0xd5, 0x6a, 0xb5, 0xd9, 0x80, 0x68,
0x34, 0x12, 0x11, 0x04, 0xa0, 0xae, 0xee, 0xc0,
0x81, 0xa2, 0x22, 0xad, 0x37, 0xf9, 0xe7, 0x60,
0xb3, 0x91, 0x3d, 0x18, 0x8b, 0xad, 0xad, 0xc5,
0xe3, 0x8a, 0xe2, 0x72, 0xc5, 0x62, 0x6f, 0xde,
0xe8, 0x9b, 0x9a, 0x4e, 0x37, 0x10, 0x84, 0x95,
0x95, 0x95, 0x95, 0x78, 0x5c, 0x51, 0x48, 0xa2,
0x5e, 0xbc, 0x78, 0xf5, 0xea, 0xdd, 0x3b, 0xa0,
0xb0, 0x90, 0xe7, 0x1d, 0x0e, 0x20, 0x1c, 0x5e,
0x5b, 0x23, 0x4d, 0x9b, 0x76, 0xd6, 0x90, 0x2b,
0xad, 0x5e, 0x6a, 0x85, 0x29, 0x79, 0x4c, 0x9e,
0xff, 0x9e, 0x5d, 0xfa, 0xa8, 0xaa, 0x00, 0xcb,
0x9a, 0x4c, 0x06, 0x03, 0x30, 0x37, 0xe7, 0xf7,
0x07, 0x83, 0xa2, 0x48, 0xbc, 0x1c, 0x1b, 0xd3,
0xfc, 0x35, 0xa6, 0x13, 0xe0, 0x38, 0x8b, 0x85,
0xe3, 0x06, 0x06, 0x3e, 0x7f, 0x9e, 0x9a, 0xf2,
0x7a, 0x4b, 0x4b, 0x0b, 0x0b, 0x5d, 0xae, 0xb2,
0x32, 0xc0, 0x62, 0xc9, 0xcb, 0x2b, 0x29, 0x01,
0x7c, 0xbe, 0x70, 0x38, 0x91, 0x00, 0xd6, 0xd7,
0x25, 0x29, 0xb5, 0xc4, 0xa7, 0x56, 0x58, 0x72,
0xe6, 0xeb, 0x9d, 0xa5, 0x36, 0xaf, 0xcf, 0xe9,
0x25, 0x6e, 0xb3, 0x9c, 0xe6, 0xe4, 0x58, 0x2c,
0x19, 0x19, 0x80, 0x24, 0x91, 0x3a, 0xe1, 0x76,
0x7b, 0x3c, 0xd3, 0xd3, 0x73, 0x73, 0x6f, 0xdf,
0x12, 0xa5, 0x6c, 0x49, 0x80, 0x7c, 0x66, 0x68,
0x88, 0xb4, 0x14, 0x8d, 0x8d, 0x05, 0x05, 0x7b,
0xf6, 0x14, 0x17, 0x03, 0xa1, 0x50, 0x34, 0x2a,
0x49, 0x80, 0xdf, 0x1f, 0x0a, 0xc5, 0xe3, 0x9b,
0x25, 0x9b, 0xa2, 0xb4, 0x4a, 0x90, 0xdc, 0x0e,
0x53, 0x54, 0xea, 0x7c, 0xf2, 0xba, 0x54, 0x3b,
0xfd, 0xfb, 0x14, 0x05, 0x24, 0x12, 0xc4, 0xf1,
0xc1, 0xc1, 0xc1, 0x41, 0xb7, 0x5b, 0x14, 0x79,
0x7e, 0x75, 0xf5, 0xfd, 0xfb, 0x7b, 0xf7, 0xd2,
0xbf, 0x9a, 0x46, 0xc0, 0x64, 0x9a, 0x9f, 0x9f,
0x9f, 0xf7, 0xf9, 0xdc, 0x6e, 0xab, 0x35, 0x2b,
0xcb, 0x6a, 0x55, 0x94, 0xfa, 0x7a, 0xa7, 0x93,
0xe7, 0x69, 0x7a, 0x6c, 0x6c, 0x71, 0x51, 0x92,
0x36, 0x8b, 0x7c, 0x2a, 0xf5, 0xf4, 0xeb, 0xf4,
0xa3, 0x32, 0x3d, 0x2b, 0xe9, 0x76, 0x3c, 0x6f,
0xb3, 0x99, 0x4c, 0x80, 0x28, 0xca, 0xb2, 0xa2,
0x00, 0xe3, 0xe3, 0x1e, 0x8f, 0xdb, 0xbd, 0xb4,
0xf4, 0xfa, 0x75, 0x47, 0x47, 0x77, 0xf7, 0xd3,
0xa7, 0xdb, 0x10, 0xc8, 0xcd, 0x1d, 0x1d, 0x1d,
0x1d, 0x1d, 0x1d, 0xe5, 0xb8, 0x82, 0x82, 0xc2,
0xc2, 0x82, 0x02, 0x9a, 0xee, 0xeb, 0xfb, 0xf4,
0x69, 0x75, 0x15, 0x3f, 0x00, 0x22, 0x05, 0x4d,
0x26, 0xc9, 0x92, 0x49, 0x95, 0xcf, 0xc6, 0x88,
0x27, 0xdb, 0x49, 0x92, 0x24, 0x91, 0xe7, 0x91,
0x48, 0x20, 0x20, 0xcb, 0xc0, 0xea, 0xea, 0xc2,
0x42, 0x57, 0x17, 0x59, 0xab, 0x35, 0xf8, 0x7a,
0x08, 0xd3, 0x08, 0x44, 0x22, 0xc1, 0x60, 0x30,
0x18, 0x0c, 0x4e, 0x4e, 0x8e, 0x8c, 0x0c, 0x0f,
0x0f, 0x0f, 0xdf, 0xbd, 0xcb, 0x71, 0x16, 0x8b,
0xc7, 0x73, 0xfb, 0xf6, 0x8f, 0x50, 0xf8, 0x9d,
0x90, 0xa4, 0xe5, 0xe5, 0xc9, 0xc9, 0xa9, 0xa9,
0xe1, 0xe1, 0x9e, 0x9e, 0x47, 0x8f, 0xda, 0xda,
0xc8, 0xac, 0xd6, 0xd6, 0x09, 0xc2, 0xb7, 0x8c,
0x6e, 0x6e, 0xce, 0x30, 0x64, 0x64, 0xd9, 0x54,
0x43, 0x6d, 0xa4, 0x69, 0xfc, 0x51, 0x68, 0x39,
0x4a, 0x24, 0xc8, 0xa8, 0x69, 0x20, 0x14, 0x22,
0xe3, 0xda, 0xda, 0x36, 0x04, 0xb6, 0x82, 0xe6,
0xf8, 0x4e, 0x9a, 0x80, 0x5f, 0x81, 0x26, 0x99,
0x7f, 0xa3, 0x84, 0xfe, 0x8f, 0xef, 0xe3, 0x6f,
0xc7, 0x72, 0xa6, 0x5a, 0xf7, 0x8f, 0xb0, 0xcc,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xae, 0x42, 0x60, 0x82};

229
art/tango/document_print.h Normal file
View File

@@ -0,0 +1,229 @@
/* document_print.png - 544 bytes */
static const unsigned char document_print_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x11, 0x00,
0x00, 0x0b, 0x11, 0x01, 0x7f, 0x64, 0x5f, 0x91,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0b, 0x15, 0x12, 0x0d, 0x2f, 0x9f,
0xed, 0x85, 0x8a, 0x00, 0x00, 0x01, 0xad, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x93, 0xcd,
0x8a, 0x13, 0x41, 0x14, 0x85, 0xbf, 0x7b, 0x33,
0x8b, 0xbc, 0x40, 0x76, 0x0d, 0x59, 0xa9, 0xab,
0xd0, 0x04, 0xe3, 0x26, 0x44, 0x07, 0x1f, 0xc2,
0x9f, 0x77, 0x10, 0xc1, 0x07, 0xd0, 0x1e, 0x67,
0x40, 0x10, 0x11, 0x74, 0x44, 0x7d, 0x86, 0x49,
0xf2, 0x04, 0xc9, 0x46, 0x46, 0xc2, 0x6c, 0xb2,
0x4c, 0x56, 0x13, 0x77, 0x2a, 0x04, 0x3a, 0x7f,
0x24, 0x81, 0xe9, 0x4e, 0xa7, 0xaa, 0x5c, 0x68,
0x1a, 0xdb, 0x44, 0x47, 0xb4, 0xa0, 0x16, 0xf7,
0x52, 0xf7, 0xd4, 0xe1, 0x7c, 0x55, 0xf0, 0x9f,
0x4b, 0x7e, 0x2e, 0x1a, 0xcd, 0xfa, 0x21, 0x10,
0xfc, 0xc5, 0xdc, 0xd1, 0xdd, 0x3b, 0xf7, 0x0e,
0xb6, 0xba, 0x8d, 0x66, 0xdd, 0xc5, 0x71, 0x9c,
0xd9, 0xcf, 0x5f, 0x3c, 0xcb, 0xd4, 0x51, 0x14,
0xb9, 0x46, 0xb3, 0xee, 0x36, 0x33, 0x7b, 0xbb,
0xe4, 0xbb, 0xdd, 0x2e, 0x00, 0x9d, 0xb3, 0x53,
0x00, 0x5e, 0x1d, 0xbf, 0xa4, 0x56, 0xdd, 0x07,
0xa0, 0x52, 0xa9, 0x64, 0xce, 0xea, 0x2e, 0x81,
0x52, 0xa9, 0x94, 0x0e, 0x6f, 0x56, 0xe7, 0xec,
0x14, 0xdf, 0xf7, 0x71, 0xce, 0x65, 0xfa, 0x5b,
0x0e, 0xac, 0xb5, 0xf4, 0x7a, 0x3d, 0x6a, 0xd5,
0x7d, 0x54, 0x95, 0x8f, 0x9d, 0x0f, 0xdc, 0xaa,
0xdd, 0x46, 0x44, 0xe8, 0xf7, 0xfb, 0x94, 0xcb,
0xe5, 0x3f, 0x0b, 0x00, 0x78, 0x9e, 0x87, 0xaa,
0x22, 0xf2, 0x3d, 0xe3, 0x62, 0xb1, 0x88, 0x88,
0x20, 0x22, 0x97, 0x3b, 0x70, 0xce, 0x51, 0x28,
0x14, 0xd2, 0xfa, 0xe1, 0x83, 0x47, 0x29, 0x2c,
0x91, 0xdf, 0x60, 0x7c, 0x12, 0x3c, 0x3e, 0x04,
0x82, 0x7c, 0x3e, 0xcf, 0xd5, 0x2b, 0xd7, 0xb0,
0xd6, 0xa2, 0xba, 0x1d, 0x8f, 0xb5, 0x16, 0x11,
0x61, 0xf0, 0xe9, 0x9c, 0x28, 0x8a, 0x00, 0x8e,
0x36, 0x0e, 0x82, 0x83, 0xe0, 0x29, 0xc6, 0x18,
0x92, 0x24, 0xb9, 0xf4, 0x11, 0xcc, 0xe7, 0x35,
0x54, 0x95, 0x77, 0xef, 0xdf, 0x06, 0xe9, 0x35,
0x22, 0xc2, 0x60, 0x30, 0x20, 0x8e, 0x63, 0xda,
0xed, 0x36, 0xce, 0x39, 0xc2, 0x30, 0x64, 0x3a,
0x9d, 0x32, 0x1e, 0x8f, 0x99, 0x4c, 0x26, 0x8c,
0x46, 0x23, 0x86, 0xc3, 0x21, 0xad, 0x56, 0x8b,
0xaf, 0x5f, 0x3e, 0x67, 0x33, 0x58, 0x2c, 0x16,
0x44, 0x17, 0x17, 0xcc, 0x66, 0x33, 0x7c, 0xdf,
0x27, 0x0c, 0x43, 0x00, 0x92, 0x24, 0x49, 0xad,
0x03, 0x18, 0x63, 0x18, 0x8f, 0x42, 0xa2, 0x78,
0x95, 0x15, 0x50, 0x55, 0xe6, 0x8b, 0x05, 0xed,
0x76, 0x8b, 0xe5, 0x72, 0x09, 0xc0, 0x7a, 0xbd,
0x46, 0x45, 0xb0, 0xd6, 0xb0, 0x36, 0x06, 0xd5,
0x1c, 0x7b, 0xb9, 0x1c, 0xd5, 0xda, 0xcd, 0xdd,
0x14, 0x8c, 0x31, 0x5c, 0xaf, 0xdc, 0x48, 0x69,
0xfc, 0xe0, 0x82, 0xb5, 0x0e, 0x63, 0x0c, 0xaa,
0x9a, 0xe2, 0xdd, 0x84, 0x9c, 0x0a, 0xac, 0x56,
0x2b, 0x3c, 0xcf, 0x4b, 0xad, 0xfe, 0xca, 0x7b,
0x43, 0x41, 0x55, 0x71, 0xce, 0x61, 0xad, 0xcd,
0x08, 0x9c, 0x1c, 0xbf, 0x79, 0x7d, 0xff, 0x1f,
0x7e, 0xf3, 0xc9, 0x37, 0xc1, 0x23, 0xd9, 0x67,
0xfd, 0x0b, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
/* document_print.png - 1230 bytes */
static const unsigned char document_print_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
0x59, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0xcf, 0x6f, 0x12, 0x5b, 0x14, 0xfe, 0x66,
0xfa, 0x06, 0x06, 0x25, 0xa6, 0x6d, 0x5a, 0x50,
0x4c, 0x51, 0x44, 0x58, 0xb0, 0xa8, 0x0b, 0x8c,
0xd5, 0x98, 0x68, 0x6c, 0x4c, 0x34, 0xae, 0xfc,
0xd5, 0x98, 0xa6, 0xba, 0xc7, 0xbf, 0xc1, 0x68,
0x22, 0xd5, 0xa8, 0x0b, 0xd7, 0xba, 0xd1, 0x18,
0xca, 0xc2, 0x34, 0x56, 0x4c, 0x4d, 0x8c, 0xc6,
0x14, 0xd0, 0x60, 0xca, 0xa2, 0x3b, 0x96, 0x6a,
0x4d, 0x14, 0x6c, 0xc0, 0x05, 0x03, 0xc8, 0xcf,
0x61, 0xe6, 0xba, 0xb8, 0xbd, 0xef, 0x96, 0x5f,
0x85, 0xda, 0xfa, 0x5e, 0x5e, 0xf2, 0xce, 0xe6,
0xcb, 0xb9, 0x5c, 0xce, 0xfd, 0xbe, 0x73, 0xce,
0x9c, 0xb9, 0x03, 0xfc, 0x6f, 0xff, 0xae, 0x09,
0x1b, 0xfd, 0x43, 0x28, 0xf4, 0xe2, 0xc5, 0xf3,
0xe7, 0xcf, 0x9e, 0x51, 0xef, 0xc2, 0x85, 0xad,
0xa5, 0x33, 0x37, 0x77, 0xee, 0xdc, 0xd9, 0xb3,
0xe7, 0xcf, 0x5f, 0xbc, 0xf8, 0xc7, 0x14, 0x53,
0x01, 0xe4, 0x6f, 0xd3, 0x34, 0x4d, 0xd3, 0xb4,
0xdf, 0x47, 0x66, 0x2c, 0xee, 0x46, 0xf9, 0xfc,
0xb5, 0x59, 0x41, 0xc9, 0x64, 0x32, 0x99, 0x4c,
0x02, 0x99, 0x4c, 0x26, 0x93, 0xc9, 0xf0, 0xf5,
0x48, 0x24, 0x12, 0x59, 0x58, 0x00, 0x04, 0x41,
0x10, 0x04, 0x01, 0x18, 0x1f, 0x1f, 0x1f, 0x3f,
0x79, 0x92, 0xfb, 0x36, 0x9b, 0xcd, 0x66, 0xb3,
0x01, 0x56, 0xab, 0xd5, 0x6a, 0xb5, 0x36, 0x47,
0x15, 0x56, 0x3b, 0xa3, 0xbb, 0x20, 0x71, 0xab,
0x2a, 0x63, 0xb1, 0x58, 0x2c, 0x16, 0x0b, 0xb0,
0xb8, 0xb8, 0xb8, 0xf8, 0xe1, 0x03, 0x60, 0x32,
0x99, 0x4c, 0x26, 0x13, 0x20, 0xcb, 0xb2, 0x2c,
0xcb, 0x7c, 0x9d, 0x11, 0x17, 0x45, 0x51, 0x14,
0x3b, 0x9e, 0x2e, 0xf6, 0xcc, 0x6b, 0xcb, 0x04,
0xcc, 0xce, 0xce, 0xce, 0x3e, 0x7d, 0x0a, 0x54,
0xab, 0xd5, 0x6a, 0xb5, 0x0a, 0x54, 0x2a, 0x95,
0x4a, 0xa5, 0xd2, 0x8a, 0xc1, 0x60, 0x30, 0x18,
0x08, 0xf0, 0x4a, 0x6c, 0x56, 0xc0, 0xa6, 0x5b,
0x88, 0x11, 0x99, 0x9c, 0x9c, 0x9c, 0x9c, 0x9a,
0xe2, 0x7e, 0x28, 0x14, 0x0a, 0xcd, 0xcd, 0xf1,
0x7d, 0x13, 0x13, 0x13, 0x13, 0x97, 0x2e, 0xf1,
0xcc, 0xaf, 0x2f, 0x40, 0x55, 0x7b, 0x3d, 0xbf,
0x67, 0xa5, 0xd7, 0xaf, 0xdf, 0xb8, 0x71, 0xed,
0x9a, 0xd7, 0xdb, 0x9a, 0x2b, 0x4a, 0x28, 0x9d,
0x4e, 0xa7, 0xd3, 0x69, 0x8e, 0x92, 0x24, 0x49,
0x92, 0x04, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0e,
0xb6, 0x12, 0xef, 0xd4, 0x42, 0x9d, 0xce, 0xf9,
0x6d, 0x01, 0x34, 0xe0, 0xe5, 0xcb, 0xd4, 0x5b,
0x5a, 0xea, 0x54, 0x01, 0xd6, 0xdb, 0x0c, 0x47,
0x47, 0x47, 0x47, 0x0f, 0x1c, 0x00, 0x9c, 0x4e,
0xa7, 0xd3, 0xe9, 0xe4, 0x84, 0x9b, 0xb1, 0xbd,
0x2d, 0x2d, 0x35, 0x9e, 0xbb, 0x4e, 0xb3, 0xf5,
0x46, 0x7c, 0x66, 0xc6, 0xef, 0xbf, 0x79, 0xf3,
0xd6, 0x2d, 0xfe, 0x7b, 0xa1, 0x50, 0x28, 0x14,
0x0a, 0xdc, 0xd7, 0x75, 0x5d, 0xd7, 0x75, 0x80,
0x8e, 0x47, 0xc0, 0x6e, 0xb7, 0xdb, 0xf7, 0xec,
0x01, 0x46, 0x46, 0x46, 0x46, 0xec, 0x76, 0xfe,
0x0c, 0x94, 0xcb, 0xe5, 0x72, 0xb9, 0x0c, 0x14,
0x8b, 0xc5, 0x62, 0xb1, 0xd8, 0x1a, 0xc7, 0xed,
0x76, 0xb9, 0x5c, 0x2e, 0xe6, 0xcd, 0xcc, 0x50,
0x1e, 0x53, 0x53, 0xac, 0xde, 0x2d, 0x09, 0xec,
0x95, 0x78, 0x3e, 0x9f, 0xcb, 0x65, 0xb3, 0x40,
0x38, 0x1c, 0x8d, 0x46, 0xa3, 0x40, 0x24, 0x12,
0x0e, 0x87, 0xc3, 0x94, 0xb8, 0xa6, 0xf5, 0x5a,
0xf0, 0x56, 0xdb, 0xbd, 0x9b, 0x56, 0xcc, 0xe5,
0xa2, 0xc4, 0x0f, 0x1f, 0x3e, 0x72, 0xe4, 0xe8,
0x51, 0x60, 0x65, 0x65, 0x65, 0xe5, 0xfb, 0x77,
0x60, 0x7e, 0xfe, 0xe5, 0xcb, 0xf9, 0x79, 0xb6,
0xfb, 0xca, 0x95, 0xe9, 0x69, 0xbf, 0xff, 0xf6,
0xed, 0x60, 0xb0, 0x4b, 0xcb, 0x90, 0x16, 0xa3,
0x99, 0x23, 0x7f, 0xdc, 0xe8, 0x33, 0xc4, 0x31,
0x91, 0x48, 0x24, 0x12, 0x09, 0x42, 0x18, 0xaf,
0x66, 0xbe, 0x1d, 0xa7, 0x50, 0x2e, 0xa7, 0x28,
0xd9, 0x2c, 0x10, 0x8d, 0xbe, 0x7b, 0xf7, 0xfe,
0x3d, 0x30, 0x36, 0x36, 0x36, 0x76, 0xe8, 0x10,
0x30, 0x34, 0x34, 0x34, 0x34, 0x3c, 0x0c, 0xc4,
0xe3, 0xf1, 0x78, 0x3c, 0x0e, 0x78, 0x3c, 0x1e,
0x8f, 0xc7, 0x03, 0xd0, 0xe3, 0x5b, 0x7b, 0x9b,
0xb5, 0x54, 0x73, 0xa5, 0x08, 0xd1, 0x75, 0x42,
0x00, 0x41, 0x10, 0xc5, 0x76, 0x1d, 0x1e, 0x08,
0x04, 0x02, 0x4f, 0x9e, 0x00, 0x5e, 0xaf, 0xd7,
0x7b, 0xf0, 0x60, 0xe7, 0x0a, 0x76, 0x14, 0xf0,
0xed, 0x5b, 0x32, 0x99, 0x4a, 0x01, 0xa9, 0x54,
0x2a, 0x95, 0x4a, 0x01, 0x66, 0xb3, 0xd9, 0x6c,
0x36, 0x03, 0xb1, 0x58, 0x2c, 0x16, 0x8b, 0x01,
0x0e, 0x87, 0xc3, 0xb1, 0x77, 0x2f, 0x5d, 0xdf,
0xbe, 0x7d, 0xb5, 0x1f, 0xd7, 0x4c, 0x17, 0x26,
0xa8, 0x79, 0x5c, 0x6a, 0x5a, 0xbd, 0x5e, 0xaf,
0xb7, 0x9e, 0x47, 0x08, 0x21, 0xba, 0x0e, 0xd4,
0x6a, 0xb5, 0x9a, 0xaa, 0x02, 0xd9, 0x6c, 0x36,
0x9b, 0xcd, 0x52, 0xbf, 0xdd, 0xfe, 0xae, 0x02,
0xd8, 0xc1, 0x8c, 0xc8, 0xf4, 0xb4, 0xdf, 0xef,
0xf7, 0x03, 0xaa, 0x5a, 0xaf, 0xd7, 0x6a, 0x34,
0xb3, 0xba, 0xde, 0x8e, 0x28, 0x2d, 0x33, 0x21,
0x8d, 0x17, 0x01, 0x46, 0x70, 0xed, 0xca, 0xda,
0x4a, 0x18, 0x0c, 0xb2, 0x6c, 0x30, 0xf0, 0xb8,
0xec, 0x4d, 0x5e, 0xaf, 0xb7, 0x17, 0xdc, 0x55,
0x80, 0xa2, 0x28, 0x8a, 0xa2, 0x00, 0x6e, 0xb7,
0xdb, 0xed, 0x72, 0x01, 0x3b, 0x77, 0x5a, 0xad,
0x16, 0x0b, 0xa0, 0x28, 0xb9, 0x9c, 0xa2, 0xf0,
0x79, 0x40, 0xc9, 0x37, 0x12, 0x25, 0x84, 0x0a,
0x55, 0x55, 0xe0, 0xe7, 0x4f, 0x3a, 0x65, 0x4a,
0xa5, 0x52, 0xa9, 0x5c, 0x06, 0x44, 0xb1, 0xaf,
0x4f, 0x10, 0xb8, 0x60, 0x41, 0x10, 0x84, 0xb5,
0x2d, 0xc7, 0x2a, 0x68, 0x34, 0x1a, 0x0c, 0x92,
0x84, 0xae, 0xd6, 0x51, 0x00, 0x53, 0xce, 0x32,
0xc9, 0x5a, 0xc5, 0x68, 0x94, 0x65, 0xa3, 0x91,
0x8f, 0x45, 0x96, 0x49, 0x4d, 0xa3, 0x63, 0x94,
0x99, 0xae, 0xd3, 0xde, 0xef, 0xef, 0xef, 0xef,
0x1f, 0x1c, 0xe4, 0xc2, 0x08, 0xa1, 0xcf, 0x82,
0xae, 0xd3, 0x8a, 0xf0, 0x75, 0x8a, 0x6c, 0x1c,
0x13, 0x42, 0x88, 0x20, 0xf0, 0xab, 0x49, 0xa3,
0x31, 0xc9, 0xba, 0xde, 0x41, 0xc0, 0xc3, 0x87,
0x0b, 0x0b, 0xe1, 0xf0, 0xdb, 0xb7, 0x3e, 0xdf,
0xe9, 0xd3, 0xa7, 0x4e, 0x9d, 0x39, 0x03, 0xbc,
0x7e, 0xfd, 0xe6, 0xcd, 0xab, 0x57, 0xdd, 0x33,
0xb2, 0x55, 0xb6, 0x6f, 0x9f, 0xc3, 0xb1, 0x7f,
0x3f, 0xf0, 0xf9, 0xf3, 0xf2, 0xf2, 0xc7, 0x8f,
0x4c, 0x08, 0x63, 0xb0, 0x8e, 0x80, 0x5a, 0x4d,
0x55, 0x55, 0xf5, 0xf1, 0x63, 0x83, 0x41, 0x92,
0x24, 0xc9, 0xe7, 0xcb, 0xe7, 0xf3, 0x79, 0x45,
0x01, 0x8e, 0x1f, 0x3f, 0x76, 0xec, 0xc4, 0x89,
0xee, 0x57, 0x01, 0x66, 0x9a, 0xa6, 0x69, 0xac,
0x77, 0x9b, 0xa7, 0x0c, 0xcb, 0x74, 0xbb, 0xf7,
0x87, 0xaa, 0xaa, 0x6a, 0xbd, 0xce, 0x5b, 0x6e,
0x79, 0xf9, 0xcb, 0x97, 0x4f, 0x9f, 0xe8, 0x75,
0xfd, 0xc7, 0x8f, 0xfb, 0xf7, 0x79, 0x84, 0xd5,
0xd8, 0x9d, 0x08, 0xd0, 0xb9, 0xfb, 0xe0, 0x01,
0xf5, 0x7c, 0xbe, 0x7f, 0x2e, 0xf7, 0xed, 0x04,
0x3d, 0x7a, 0x74, 0xf7, 0xee, 0x9d, 0x3b, 0xf7,
0xee, 0x5d, 0xbd, 0xca, 0x56, 0xbb, 0x0a, 0x68,
0x34, 0x96, 0x43, 0x93, 0x89, 0x62, 0x7f, 0x3f,
0xc5, 0xe1, 0x61, 0x8a, 0xbb, 0x76, 0x51, 0xdc,
0xb1, 0x83, 0xe2, 0xb6, 0x6d, 0x8d, 0xc8, 0x9e,
0x0e, 0x16, 0x87, 0xf9, 0xec, 0x12, 0x91, 0x4e,
0x53, 0xfc, 0xfa, 0x95, 0x22, 0xfb, 0x34, 0x2a,
0x95, 0x28, 0xb2, 0x5a, 0x35, 0xce, 0xb1, 0x0d,
0x08, 0x68, 0x36, 0xd6, 0x3c, 0x7d, 0x7d, 0x14,
0xd9, 0xbc, 0x60, 0xbe, 0x2c, 0x37, 0xae, 0x37,
0x0b, 0x60, 0x84, 0x58, 0x26, 0xcb, 0xe5, 0x46,
0x9f, 0xed, 0xdf, 0xf8, 0x27, 0xe6, 0x7f, 0xce,
0x7e, 0x01, 0x3d, 0x5a, 0x60, 0xf5, 0xf2, 0x06,
0x15, 0x25, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};

340
art/tango/document_save.h Normal file
View File

@@ -0,0 +1,340 @@
/* document_save.png - 911 bytes */
static const unsigned char document_save_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0b, 0x0a, 0x0d, 0x37, 0x0f, 0x9e,
0x2a, 0xd8, 0xbf, 0x00, 0x00, 0x00, 0x8c, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
0x8a, 0xc7, 0x47, 0x00, 0x00, 0x02, 0x84, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x92, 0x4d,
0x48, 0x54, 0x61, 0x14, 0x86, 0x9f, 0xb9, 0xdd,
0xf1, 0xe6, 0xcf, 0xe4, 0x4c, 0xe0, 0xb5, 0x31,
0xcd, 0x91, 0xb2, 0x51, 0x6c, 0x51, 0x51, 0x34,
0x26, 0x14, 0xb8, 0xc8, 0x16, 0x45, 0x14, 0x2e,
0x42, 0x28, 0x2c, 0x82, 0x8a, 0xa9, 0xc1, 0x56,
0x2d, 0x2a, 0xca, 0x45, 0x11, 0x54, 0x10, 0x06,
0x52, 0xb4, 0x28, 0x0a, 0x22, 0xb0, 0x28, 0x28,
0x6a, 0x5b, 0xd0, 0x22, 0x89, 0x44, 0x8a, 0xa6,
0x45, 0x99, 0x54, 0x6a, 0x86, 0xa4, 0xe8, 0xdc,
0x9b, 0xce, 0xfd, 0xf9, 0x4e, 0x0b, 0x61, 0x6c,
0xb2, 0x36, 0xbd, 0x9b, 0xf3, 0xc1, 0xe1, 0x3c,
0x9c, 0xf7, 0x3d, 0x5f, 0xe0, 0xc8, 0xd9, 0xe3,
0x27, 0x3f, 0x5b, 0x15, 0xda, 0xd8, 0xb8, 0x33,
0x09, 0x54, 0x01, 0x5b, 0x81, 0x86, 0xa0, 0x26,
0xd9, 0xd0, 0xc2, 0x9f, 0x3f, 0x16, 0x19, 0xce,
0xcd, 0xbb, 0xe7, 0xcf, 0x9d, 0xe0, 0x1f, 0x0a,
0x34, 0x77, 0x74, 0xed, 0x8d, 0xad, 0xac, 0x8f,
0x55, 0x97, 0x9b, 0x83, 0xab, 0x6b, 0xca, 0x3a,
0xaa, 0x23, 0x85, 0x6b, 0x6d, 0xcf, 0x27, 0xfd,
0x2d, 0xc3, 0xeb, 0xde, 0xe7, 0xea, 0xc3, 0xd7,
0x51, 0xe2, 0x91, 0x37, 0xcb, 0xba, 0x3b, 0xef,
0x0c, 0xff, 0x15, 0x90, 0x3c, 0x7d, 0xbe, 0xdb,
0x9d, 0x1a, 0x3b, 0xec, 0x89, 0xc6, 0xa8, 0x1f,
0x66, 0xda, 0x28, 0x63, 0x81, 0x1e, 0xa4, 0xad,
0x65, 0x23, 0xcb, 0x2b, 0x16, 0x73, 0xf9, 0xfe,
0x0b, 0xfc, 0xa1, 0x3e, 0x62, 0x05, 0xe3, 0x7f,
0x9b, 0xef, 0x24, 0x79, 0x2c, 0x25, 0x5f, 0x46,
0x06, 0x44, 0x44, 0x64, 0xe0, 0x73, 0x5a, 0x7a,
0xd3, 0x03, 0x92, 0xba, 0xf6, 0x44, 0x12, 0x07,
0x2f, 0x48, 0xcf, 0xab, 0x2f, 0xd2, 0xf5, 0xf4,
0xad, 0xb4, 0x9e, 0xba, 0x2e, 0xef, 0x06, 0x87,
0xe5, 0x77, 0x59, 0x96, 0x25, 0xa9, 0x8e, 0xa4,
0xe8, 0x86, 0xee, 0xb3, 0xb4, 0x3c, 0xc6, 0xc4,
0xc4, 0x04, 0xe1, 0x92, 0x72, 0xb4, 0xc0, 0x24,
0x85, 0xe2, 0x00, 0xd0, 0xf7, 0x71, 0x14, 0xb3,
0x44, 0xe7, 0xfb, 0x78, 0x86, 0xf7, 0x03, 0x9f,
0x58, 0xb2, 0xa8, 0x10, 0x02, 0x00, 0x42, 0x41,
0x41, 0x01, 0x00, 0xba, 0xe7, 0x82, 0x28, 0xc1,
0x57, 0x8a, 0xed, 0x27, 0x6e, 0xcc, 0xdb, 0xb1,
0x77, 0x70, 0x02, 0xd7, 0xf3, 0xb9, 0xd8, 0xf3,
0x92, 0x8b, 0x3d, 0x2f, 0x01, 0x78, 0x7c, 0x76,
0x1f, 0xc8, 0x6c, 0x5f, 0x03, 0x50, 0xa2, 0x50,
0xbe, 0xa2, 0xeb, 0x50, 0x23, 0x00, 0xed, 0xbb,
0x77, 0xd2, 0x98, 0x58, 0xc7, 0xcc, 0x8c, 0x4d,
0x34, 0xa4, 0xd1, 0x94, 0x58, 0xcf, 0xde, 0xd6,
0xed, 0x00, 0xec, 0x69, 0x5e, 0x81, 0xf2, 0x15,
0x22, 0x32, 0x07, 0x10, 0x11, 0x22, 0x91, 0x30,
0x15, 0x65, 0x31, 0x2e, 0x1d, 0x58, 0xc7, 0xcd,
0xbb, 0x0f, 0x88, 0xc7, 0xaa, 0xd0, 0x08, 0xa0,
0x11, 0x20, 0x51, 0x5f, 0xcd, 0xad, 0x7b, 0x8f,
0x68, 0xdb, 0x5c, 0xc3, 0x8e, 0xa6, 0xf5, 0x14,
0x15, 0x17, 0xe5, 0x03, 0x00, 0x2c, 0xcb, 0xc2,
0x34, 0x4d, 0xaa, 0xa3, 0xb5, 0x39, 0x48, 0xe3,
0xaa, 0xe5, 0xd4, 0xc6, 0x2a, 0xb9, 0x7c, 0xfb,
0x21, 0x6d, 0x9b, 0x6b, 0xd8, 0xb5, 0x29, 0x81,
0x69, 0x9a, 0x38, 0x8e, 0x93, 0xb3, 0xa8, 0x03,
0x28, 0xa5, 0xb0, 0x6d, 0x1b, 0x00, 0xd3, 0x34,
0x31, 0x4d, 0x93, 0xee, 0xa3, 0x85, 0x1c, 0xbb,
0xda, 0x43, 0xd6, 0xf5, 0xd9, 0xdf, 0x52, 0x4f,
0xfb, 0xb6, 0x2d, 0x68, 0x9a, 0xc6, 0xd4, 0xd4,
0x14, 0xb6, 0x6d, 0x13, 0x0a, 0x85, 0xe6, 0x00,
0x86, 0x61, 0x50, 0x59, 0x59, 0x99, 0x17, 0xde,
0x9a, 0x86, 0x0d, 0x3c, 0xbb, 0xb2, 0x01, 0x00,
0xdb, 0xb6, 0x71, 0x1c, 0x87, 0xe9, 0xe9, 0xe9,
0x79, 0x21, 0xeb, 0x00, 0xfd, 0xfd, 0xfd, 0xb8,
0xae, 0x9b, 0xd7, 0xf0, 0x3c, 0x0f, 0x5d, 0xd7,
0x73, 0xef, 0x3f, 0x15, 0x89, 0x44, 0xf2, 0x33,
0xf0, 0x3c, 0x8f, 0x74, 0x3a, 0xcd, 0xc8, 0xc8,
0x08, 0x99, 0x4c, 0x06, 0x11, 0x41, 0x44, 0x30,
0x0c, 0x83, 0xa1, 0xa1, 0x21, 0x42, 0xa1, 0x50,
0xae, 0x5a, 0x96, 0x85, 0x65, 0x59, 0xf9, 0x57,
0x50, 0x4a, 0x51, 0x5c, 0x5c, 0x44, 0x30, 0x18,
0xcc, 0x7d, 0x12, 0x00, 0xd7, 0x75, 0x11, 0x35,
0x0b, 0x13, 0x35, 0x7b, 0x3e, 0xe5, 0xfb, 0xf9,
0x16, 0xc2, 0xe1, 0x30, 0xa5, 0xa5, 0xa5, 0x44,
0xa3, 0x51, 0x00, 0xb2, 0xd9, 0x2c, 0x40, 0x2e,
0xed, 0x78, 0x5d, 0x1c, 0xa5, 0x14, 0xf1, 0xba,
0x3a, 0x94, 0x52, 0x2c, 0x89, 0x46, 0x73, 0x96,
0x03, 0xa9, 0x8e, 0xe4, 0x19, 0xe0, 0x34, 0xff,
0xa7, 0xce, 0x5f, 0x93, 0x3b, 0x33, 0x4c, 0xd5,
0x22, 0x62, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
/* document_save.png - 1755 bytes */
static const unsigned char document_save_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
0x66, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
0x56, 0x49, 0x4c, 0x13, 0x6f, 0x14, 0x7f, 0x33,
0xa5, 0x1b, 0x1d, 0x4a, 0xa7, 0x65, 0x86, 0xb6,
0x58, 0x4a, 0x01, 0x6b, 0x11, 0x64, 0x33, 0xa0,
0xb8, 0x63, 0xe2, 0x01, 0x23, 0x46, 0x2f, 0x7a,
0xd0, 0x8b, 0x41, 0x0f, 0xa2, 0x51, 0x71, 0x09,
0xc6, 0xe5, 0xa0, 0x46, 0x03, 0x1a, 0xd1, 0x10,
0xe1, 0xe0, 0x92, 0xb8, 0x81, 0x92, 0xc8, 0xc5,
0x03, 0x1a, 0x43, 0x8c, 0xc4, 0x18, 0x15, 0x12,
0xdc, 0x11, 0x43, 0xc1, 0xda, 0x14, 0x8b, 0x94,
0xb6, 0x94, 0x4e, 0xf7, 0x65, 0xfe, 0x87, 0xc9,
0x38, 0xd8, 0xda, 0xe0, 0xfa, 0x4f, 0xfc, 0x25,
0x93, 0x2f, 0xef, 0x7d, 0xdb, 0xfb, 0xbd, 0xed,
0x1b, 0x80, 0x7f, 0x1c, 0xc8, 0x4c, 0x0b, 0x76,
0xee, 0x3c, 0x79, 0xb2, 0xbe, 0xfe, 0xca, 0x95,
0x4f, 0x9f, 0x28, 0x4a, 0xad, 0x5e, 0xb7, 0xce,
0x66, 0x73, 0x38, 0x82, 0x41, 0xb9, 0x3c, 0xd1,
0x7a, 0xb1, 0x98, 0xcf, 0xa7, 0x69, 0x8f, 0x87,
0x24, 0x31, 0xcc, 0xed, 0x1e, 0x18, 0x48, 0x4f,
0x97, 0x48, 0xde, 0xbf, 0xaf, 0xab, 0x6b, 0x6e,
0x3e, 0x7a, 0xf4, 0xce, 0x9d, 0x27, 0x4f, 0xfe,
0x37, 0x02, 0x2d, 0x2d, 0xd7, 0xae, 0xd5, 0xd5,
0x15, 0x17, 0x77, 0x76, 0xbe, 0x78, 0xa1, 0xd3,
0xf5, 0xf6, 0x66, 0x65, 0xe9, 0xf5, 0x79, 0x79,
0x81, 0x80, 0x56, 0x9b, 0x9e, 0x4e, 0x92, 0x28,
0xea, 0x76, 0x87, 0x42, 0x28, 0x2a, 0x12, 0x65,
0x64, 0x48, 0xa5, 0x22, 0x11, 0x8a, 0x7e, 0xfe,
0xec, 0x76, 0x07, 0x83, 0x00, 0x0e, 0x87, 0xcf,
0x17, 0x08, 0x00, 0x4c, 0x4e, 0x7e, 0xf8, 0xd0,
0xdd, 0x3d, 0x32, 0xe2, 0xf5, 0x7a, 0x3c, 0x7e,
0xbf, 0x50, 0xa8, 0xd3, 0xe1, 0xf8, 0xe0, 0x60,
0x7d, 0x7d, 0x6b, 0xeb, 0xb1, 0x63, 0xed, 0xed,
0x6d, 0x6d, 0x7f, 0x8a, 0x00, 0x2f, 0x91, 0xe1,
0xdd, 0xdd, 0x83, 0x83, 0x2a, 0x55, 0x67, 0x67,
0x66, 0x66, 0x61, 0xe1, 0x8a, 0x15, 0x32, 0x99,
0xc9, 0x64, 0x34, 0x0e, 0x0e, 0x0a, 0x04, 0xc3,
0xc3, 0x26, 0x93, 0xc9, 0xc4, 0xe7, 0x9b, 0xcd,
0x1f, 0x3f, 0x0e, 0x0f, 0xa3, 0xa8, 0xd9, 0x3c,
0x31, 0x61, 0xb7, 0x03, 0xf0, 0xf9, 0x29, 0x29,
0x72, 0x39, 0x00, 0x8e, 0x8b, 0x44, 0x02, 0x01,
0x80, 0x48, 0x44, 0x10, 0xb9, 0xb9, 0x38, 0x3e,
0x39, 0xe9, 0xf3, 0x45, 0xa3, 0x52, 0xe9, 0xe8,
0xa8, 0xcd, 0x26, 0x12, 0x55, 0x55, 0x55, 0x57,
0xaf, 0x59, 0xa3, 0x50, 0xf4, 0xf7, 0xf7, 0xf6,
0x3e, 0x7a, 0xf4, 0xee, 0x9d, 0xd1, 0xf8, 0xbb,
0x04, 0xd0, 0x58, 0xc5, 0xf3, 0xe7, 0x43, 0x43,
0x22, 0x51, 0x63, 0xe3, 0xac, 0x59, 0x69, 0x69,
0x49, 0x49, 0x26, 0x13, 0x45, 0x19, 0x8d, 0x0f,
0x1e, 0x7c, 0xf8, 0x50, 0x5e, 0x4e, 0x10, 0xcf,
0x9e, 0x6d, 0xde, 0xdc, 0xd3, 0xd3, 0xd4, 0x54,
0x5b, 0x8b, 0xa2, 0x4b, 0x97, 0x6a, 0xb5, 0x7d,
0x7d, 0x55, 0x55, 0xa1, 0x90, 0xcb, 0x35, 0x3a,
0x3a, 0x35, 0x65, 0xb1, 0x0c, 0x0f, 0xbf, 0x7d,
0x4b, 0xd3, 0xe3, 0xe3, 0x53, 0x53, 0x6e, 0x37,
0x80, 0xdb, 0xed, 0xf1, 0x50, 0x14, 0x00, 0x8e,
0x93, 0xa4, 0x4a, 0x05, 0x20, 0x91, 0x90, 0xa4,
0x46, 0x23, 0x14, 0xbe, 0x79, 0x63, 0xb3, 0x15,
0x15, 0xdd, 0xbe, 0xbd, 0x7f, 0xff, 0x89, 0x13,
0xd5, 0xd5, 0x12, 0xc9, 0x1f, 0x27, 0xe0, 0x74,
0x7a, 0xbd, 0x62, 0x71, 0x6e, 0x2e, 0x8f, 0x17,
0x89, 0x50, 0x94, 0xcb, 0xb5, 0x6c, 0xd9, 0xec,
0xd9, 0x16, 0xcb, 0xaa, 0x55, 0xa7, 0x4e, 0xed,
0xdb, 0x77, 0xf9, 0xf2, 0xad, 0x5b, 0xec, 0xba,
0x86, 0x86, 0x03, 0x07, 0x6e, 0xde, 0xbc, 0x7f,
0xbf, 0xac, 0x4c, 0xa3, 0xb1, 0x58, 0x8e, 0x1f,
0xa7, 0x28, 0xa7, 0xd3, 0xe9, 0x44, 0x10, 0x8f,
0x67, 0x6a, 0xca, 0xe1, 0x00, 0x08, 0x06, 0xfd,
0x7e, 0xaf, 0x97, 0x3b, 0x97, 0x24, 0x35, 0x9a,
0xd9, 0xb3, 0x51, 0x94, 0x20, 0x24, 0x92, 0x60,
0xd0, 0x6c, 0x9e, 0x98, 0x08, 0x06, 0x75, 0xba,
0xd6, 0xd6, 0xdf, 0x25, 0x10, 0x57, 0x03, 0x9b,
0x36, 0x1d, 0x3a, 0xb4, 0x77, 0xef, 0xdd, 0xbb,
0x3a, 0x9d, 0x50, 0x18, 0x0a, 0xbd, 0x7e, 0x3d,
0x35, 0xe5, 0x74, 0x46, 0xa3, 0x87, 0x0f, 0x27,
0x3a, 0x40, 0x28, 0x14, 0x8b, 0x11, 0x04, 0xe0,
0xf1, 0x63, 0x87, 0x43, 0xab, 0x05, 0xc8, 0xca,
0xca, 0xcf, 0x2f, 0x2d, 0x4d, 0x7c, 0xa1, 0x4c,
0xe6, 0xf3, 0x0d, 0x0c, 0x00, 0x4c, 0x4c, 0x7c,
0xf9, 0x32, 0x36, 0x06, 0xa0, 0x56, 0x47, 0xa3,
0x93, 0x93, 0x33, 0x99, 0x59, 0x5f, 0xdf, 0xdc,
0x7c, 0xfe, 0x7c, 0x4b, 0xcb, 0xe9, 0xd3, 0xb1,
0x33, 0x49, 0xb1, 0x0a, 0x8d, 0x46, 0x2a, 0x75,
0xbb, 0xef, 0xdd, 0xf3, 0x7a, 0xed, 0x76, 0x81,
0xa0, 0xb5, 0xb5, 0xa1, 0xe1, 0xd4, 0xa9, 0x33,
0x67, 0x66, 0xf6, 0xc4, 0xca, 0x95, 0x75, 0x75,
0x2d, 0x2d, 0x33, 0xaf, 0xf3, 0xfb, 0x15, 0x8a,
0x05, 0x0b, 0x00, 0x2c, 0x96, 0x91, 0x91, 0x9e,
0x1e, 0x80, 0xeb, 0xd7, 0xcf, 0x9d, 0x4b, 0xec,
0x1e, 0x80, 0x83, 0x07, 0x0f, 0x1d, 0x3a, 0x70,
0xa0, 0xb1, 0x91, 0x91, 0xe2, 0x09, 0xc4, 0xa5,
0x90, 0xd7, 0x3b, 0x36, 0x26, 0x10, 0x0c, 0x0d,
0xe1, 0xb8, 0x4c, 0x46, 0x10, 0x00, 0x5e, 0xaf,
0xd7, 0x3b, 0x3d, 0x15, 0x3c, 0x1e, 0x8f, 0xc7,
0xe3, 0x89, 0x1f, 0xe3, 0x0d, 0xf5, 0xf9, 0xbe,
0xa7, 0xe7, 0xf1, 0xf8, 0x7c, 0x81, 0x20, 0xf1,
0x79, 0x66, 0xb3, 0xc5, 0x62, 0x36, 0x73, 0x32,
0x41, 0x10, 0x04, 0x41, 0x00, 0xec, 0xda, 0xb5,
0x67, 0xcf, 0x8e, 0x1d, 0xc5, 0xc5, 0x33, 0x46,
0x80, 0x41, 0x4e, 0x8e, 0x52, 0xa9, 0x54, 0xaa,
0x54, 0x9c, 0x86, 0xa2, 0x98, 0xa2, 0xc4, 0x30,
0x89, 0x04, 0xc3, 0x7e, 0xdc, 0xe3, 0xb1, 0xa0,
0xe9, 0x68, 0x34, 0x1a, 0xe5, 0xe4, 0xf5, 0xeb,
0x8f, 0x1f, 0x6f, 0x6f, 0x07, 0x08, 0x87, 0x83,
0xc1, 0x60, 0x10, 0xa0, 0xa3, 0xe3, 0xf0, 0xe1,
0x0d, 0x1b, 0xb8, 0x79, 0x1c, 0xc7, 0x71, 0x1c,
0x07, 0xb0, 0xd9, 0x6c, 0x36, 0x9b, 0x4d, 0xaf,
0x67, 0xb4, 0x2f, 0x5f, 0x26, 0x8c, 0x00, 0x83,
0xb5, 0x6b, 0x4b, 0x4a, 0x8a, 0x8a, 0x4a, 0x4b,
0x01, 0x7c, 0x3e, 0x9f, 0xcf, 0xe7, 0x03, 0x40,
0x10, 0xe6, 0x8b, 0xf5, 0xb8, 0xc1, 0x50, 0x56,
0xb6, 0x7c, 0x39, 0x37, 0xa6, 0xa6, 0xe2, 0x38,
0x41, 0x70, 0xf3, 0x81, 0x40, 0x20, 0xe0, 0xf7,
0x4f, 0x97, 0x7d, 0x3e, 0xb7, 0x1b, 0x20, 0x37,
0xb7, 0xb8, 0x78, 0xe1, 0x42, 0x80, 0xec, 0xec,
0x82, 0x82, 0xb2, 0x32, 0x6e, 0x3e, 0x39, 0x59,
0x2c, 0x4e, 0x4e, 0xe6, 0xe4, 0xc5, 0x8b, 0x2b,
0x2a, 0x96, 0x2c, 0x61, 0xa5, 0x79, 0xf3, 0x62,
0x2d, 0x4d, 0x40, 0x60, 0xf5, 0x6a, 0xb5, 0x5a,
0xad, 0xce, 0xc8, 0x48, 0xec, 0xc9, 0x8b, 0x17,
0x77, 0xef, 0xae, 0xac, 0x04, 0x30, 0x1a, 0x5f,
0xbd, 0x7a, 0xfa, 0x94, 0xd3, 0x5b, 0xad, 0x16,
0xcb, 0xc8, 0x08, 0xe3, 0x6b, 0x9a, 0x06, 0x88,
0x44, 0xc2, 0xe1, 0x50, 0x88, 0x4b, 0x29, 0xb7,
0xdb, 0xe5, 0x72, 0x3a, 0xb9, 0xf5, 0x23, 0x23,
0x6f, 0xdf, 0xf6, 0xf5, 0x01, 0x5c, 0xb8, 0x50,
0x5b, 0xbb, 0x68, 0x51, 0xfc, 0x3d, 0x1a, 0x8d,
0x46, 0xa3, 0xd5, 0xb2, 0xd2, 0x91, 0x23, 0x09,
0x09, 0xb0, 0x39, 0x26, 0x16, 0x33, 0x1e, 0x10,
0x08, 0x04, 0x02, 0x81, 0x00, 0x40, 0xa1, 0x50,
0x28, 0x14, 0x8a, 0xf8, 0x83, 0x55, 0x2a, 0x82,
0xd0, 0x6a, 0x01, 0x9a, 0x9a, 0x6a, 0x6a, 0xe6,
0xcf, 0x07, 0x18, 0x1c, 0xec, 0xeb, 0xeb, 0xe9,
0x01, 0x90, 0xcb, 0x09, 0x42, 0xad, 0x06, 0x88,
0x46, 0x19, 0x02, 0xd3, 0x93, 0x87, 0xa6, 0x01,
0xa4, 0x52, 0x99, 0x4c, 0xa1, 0x00, 0x30, 0x1a,
0x5f, 0xbe, 0x7c, 0xf6, 0x8c, 0xdb, 0xaf, 0xd5,
0xaa, 0xd5, 0x6c, 0x82, 0x00, 0x00, 0x48, 0x24,
0x12, 0xc9, 0xf4, 0x57, 0x02, 0xc7, 0x71, 0x5c,
0xa1, 0x88, 0xaf, 0x85, 0x98, 0x08, 0xe8, 0xf5,
0xe9, 0xe9, 0x24, 0xa9, 0x54, 0x72, 0x1a, 0xa7,
0xd3, 0xe9, 0x74, 0x3a, 0xb9, 0x03, 0xd9, 0x11,
0x45, 0x51, 0x14, 0x45, 0x01, 0x74, 0xba, 0x8c,
0x8c, 0x39, 0x73, 0x00, 0x9a, 0x9b, 0xb7, 0x6f,
0xaf, 0xa8, 0x88, 0x27, 0x82, 0xa2, 0x08, 0x82,
0x20, 0x00, 0x18, 0x96, 0x9a, 0x2a, 0x97, 0x73,
0x86, 0xb3, 0xeb, 0xd9, 0xfd, 0xb1, 0xe7, 0xb3,
0xf7, 0xb2, 0x48, 0x4d, 0x95, 0x4a, 0x53, 0x53,
0x39, 0x3b, 0x13, 0x10, 0x98, 0x37, 0x6f, 0xee,
0xdc, 0xbc, 0xbc, 0xfc, 0x7c, 0x80, 0x50, 0x28,
0x14, 0x0a, 0x85, 0x68, 0x3a, 0x29, 0x29, 0x29,
0x89, 0xc7, 0x03, 0x70, 0xb9, 0x5c, 0x2e, 0x97,
0x8b, 0x3b, 0x58, 0x2c, 0x16, 0x8b, 0xc5, 0x62,
0xee, 0xc2, 0x82, 0x02, 0xbd, 0xbe, 0xb4, 0x14,
0xe0, 0xd2, 0xa5, 0xba, 0xba, 0xca, 0x4a, 0x8e,
0x88, 0x4c, 0x96, 0x96, 0xa6, 0x52, 0x01, 0x98,
0x4c, 0x03, 0x03, 0xfd, 0xfd, 0xdc, 0x3c, 0xbb,
0x3e, 0xd6, 0x60, 0x76, 0x8c, 0x44, 0x22, 0x91,
0x70, 0x18, 0x80, 0xa2, 0x28, 0x8a, 0xa2, 0x68,
0x3a, 0x27, 0x27, 0x3b, 0x3b, 0x27, 0x87, 0xb5,
0xb3, 0xa2, 0x22, 0x8e, 0x40, 0x20, 0x10, 0x08,
0x04, 0x02, 0x85, 0x85, 0x4a, 0xa5, 0x52, 0xa9,
0x54, 0x02, 0x60, 0x18, 0x86, 0x61, 0x18, 0x82,
0x84, 0xc3, 0xe1, 0x70, 0x24, 0x02, 0x10, 0x8d,
0x7e, 0xdb, 0x3d, 0x62, 0x2f, 0x64, 0x47, 0xb9,
0x3c, 0x25, 0x45, 0xa5, 0x02, 0x68, 0x6a, 0xda,
0xb6, 0xad, 0xac, 0x8c, 0x23, 0x72, 0xf6, 0xec,
0x96, 0x2d, 0xa5, 0xa5, 0xdc, 0x7c, 0xec, 0x3e,
0x16, 0xac, 0xe1, 0x4c, 0xcb, 0x60, 0xbb, 0x10,
0x82, 0x68, 0x34, 0x1a, 0x4d, 0x66, 0x26, 0x80,
0xdf, 0xef, 0xf7, 0x07, 0x02, 0x29, 0x29, 0xec,
0xfa, 0xaf, 0x6d, 0x54, 0x28, 0x14, 0x0a, 0x85,
0xc2, 0xb5, 0x6b, 0xf5, 0x7a, 0xbd, 0x7e, 0x7a,
0x2e, 0xb2, 0x6d, 0xec, 0x67, 0x81, 0xe3, 0x38,
0x5e, 0x5e, 0x0e, 0xf0, 0xf0, 0xe1, 0xb9, 0x73,
0xe5, 0xe5, 0x3f, 0xbf, 0x3f, 0x16, 0x06, 0x83,
0xc1, 0x60, 0x30, 0x00, 0x88, 0x44, 0x22, 0x91,
0x50, 0x58, 0x53, 0xc3, 0x68, 0xb7, 0x6e, 0x8d,
0x7b, 0x07, 0x98, 0x7e, 0x0b, 0x60, 0xb7, 0xdb,
0xed, 0x76, 0xfb, 0xcf, 0x5f, 0x44, 0xd3, 0xb1,
0xc5, 0xfb, 0x67, 0xf6, 0xb1, 0x0f, 0x5a, 0x2c,
0x92, 0x12, 0x6d, 0x08, 0x06, 0x99, 0x87, 0x85,
0xed, 0x42, 0x5d, 0x5d, 0x5d, 0x5d, 0x5d, 0x5d,
0x6c, 0xa4, 0x00, 0x24, 0x12, 0x0c, 0x4b, 0x4e,
0x06, 0x48, 0x49, 0xc1, 0x30, 0xa9, 0x94, 0x2b,
0x6a, 0xb6, 0x36, 0x10, 0x84, 0x29, 0x5e, 0x56,
0x66, 0x52, 0x92, 0x4b, 0x19, 0x92, 0x24, 0x49,
0x92, 0x04, 0x18, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
0x9f, 0x59, 0x4e, 0x44, 0x00, 0x85, 0x19, 0x10,
0x0e, 0x87, 0xc3, 0xe1, 0x30, 0x00, 0x8f, 0xc7,
0xe3, 0xf1, 0x78, 0x9c, 0xa7, 0x50, 0x14, 0x41,
0x78, 0x3c, 0xb6, 0x76, 0x38, 0xc2, 0xec, 0x3c,
0x9f, 0xcf, 0xe7, 0xf3, 0xf9, 0xbf, 0x1e, 0x91,
0x1f, 0x45, 0xc2, 0x08, 0xb0, 0x1e, 0x64, 0x5f,
0xe2, 0x92, 0x92, 0x92, 0x92, 0xe2, 0x62, 0x86,
0x50, 0x24, 0xc2, 0x11, 0x62, 0x09, 0xc6, 0x82,
0x7d, 0x47, 0xfe, 0x36, 0xe2, 0x08, 0x30, 0x21,
0xa3, 0x69, 0xa6, 0x1b, 0x21, 0xdf, 0xfc, 0x6e,
0x7f, 0xef, 0x41, 0xfb, 0x59, 0xc8, 0x64, 0x32,
0x99, 0x4c, 0xc6, 0xc9, 0x3a, 0x9d, 0x4e, 0xa7,
0xd3, 0xcd, 0x2c, 0x5b, 0xad, 0x56, 0xab, 0xd5,
0xca, 0xc6, 0x92, 0xb3, 0xeb, 0x2b, 0x01, 0xab,
0xd5, 0x6a, 0x1d, 0x1b, 0xdb, 0xb8, 0xf1, 0xc6,
0x8d, 0xb6, 0xb6, 0xab, 0x57, 0x3b, 0x3a, 0xfe,
0xbe, 0xef, 0x7e, 0x05, 0x08, 0xc2, 0xd8, 0xf9,
0xbd, 0x9f, 0x8e, 0x7f, 0x14, 0xff, 0x01, 0x85,
0x15, 0x45, 0xf6, 0x3e, 0x16, 0xe7, 0xe2, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};

View File

@@ -0,0 +1,332 @@
/* document_save_as.png - 866 bytes */
static const unsigned char document_save_as_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0b, 0x0a, 0x0d, 0x38, 0x0f, 0x19,
0xb2, 0xc4, 0x70, 0x00, 0x00, 0x00, 0x8c, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
0x8a, 0xc7, 0x47, 0x00, 0x00, 0x02, 0x57, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x92, 0x4f,
0x48, 0x93, 0x61, 0x1c, 0xc7, 0x3f, 0xef, 0xdb,
0xfc, 0x33, 0x73, 0xf2, 0xce, 0xe1, 0x6b, 0x5a,
0xb6, 0x89, 0x9a, 0x48, 0x1d, 0x22, 0x34, 0xb6,
0x04, 0x0d, 0x0f, 0x69, 0x90, 0x44, 0xe1, 0x21,
0x84, 0xc4, 0x22, 0xa8, 0x58, 0x8d, 0x79, 0xea,
0x60, 0x61, 0x1e, 0x0c, 0x21, 0x03, 0xf1, 0x20,
0x45, 0x87, 0xa4, 0x20, 0x84, 0x15, 0x05, 0x45,
0xdd, 0x22, 0xa1, 0x83, 0x66, 0x79, 0x28, 0xb2,
0x83, 0x9a, 0x68, 0x59, 0x86, 0xe4, 0x70, 0x6e,
0xa5, 0xdb, 0xde, 0xf7, 0xd7, 0x61, 0xb6, 0x12,
0x2d, 0xc8, 0xcf, 0xe9, 0x79, 0x9e, 0x2f, 0xcf,
0x87, 0xef, 0xf3, 0xe3, 0x51, 0xce, 0x75, 0x5c,
0xb8, 0x38, 0x15, 0xce, 0x57, 0xe7, 0xe6, 0xa3,
0x0b, 0x40, 0x01, 0x50, 0x07, 0xec, 0x4c, 0x51,
0x65, 0xd9, 0x96, 0xfe, 0xfd, 0x5b, 0x56, 0x5a,
0xb4, 0xaf, 0xbf, 0xf3, 0x4a, 0x2b, 0x7f, 0x41,
0xa9, 0xf1, 0xf7, 0x34, 0xb9, 0x76, 0x94, 0xb9,
0x9c, 0xb9, 0xfa, 0xe4, 0xee, 0xc2, 0x1c, 0xbf,
0xd3, 0x6e, 0xdd, 0x13, 0x89, 0x1b, 0x8c, 0x7e,
0x59, 0xe4, 0xf5, 0xd0, 0x80, 0x39, 0xf6, 0x71,
0x96, 0x52, 0xfb, 0x9b, 0xed, 0xbd, 0xed, 0x77,
0x67, 0xd6, 0x15, 0x78, 0xdb, 0x3a, 0x7b, 0x63,
0xa1, 0xb9, 0xb3, 0x71, 0x51, 0x99, 0x35, 0x34,
0x7e, 0xa4, 0xe5, 0xb0, 0xc9, 0x92, 0x42, 0x63,
0xed, 0x3e, 0x8a, 0xf2, 0xb3, 0xe9, 0xbe, 0xff,
0x02, 0xe3, 0xd3, 0x08, 0xae, 0xd4, 0xf9, 0xf5,
0xee, 0xb7, 0xe3, 0x6d, 0xf1, 0xc9, 0xf4, 0xe7,
0x09, 0x11, 0x11, 0x99, 0x98, 0x1a, 0x95, 0xa1,
0xd1, 0x09, 0xf1, 0xdd, 0x78, 0x22, 0xee, 0xd3,
0x57, 0x25, 0x30, 0x3c, 0x2d, 0x3d, 0x4f, 0xdf,
0x4a, 0xc3, 0xa5, 0x9b, 0xf2, 0x6e, 0x72, 0x46,
0xfe, 0x24, 0x1c, 0x0e, 0x8b, 0xcf, 0xef, 0x15,
0x4b, 0x9a, 0xc5, 0x60, 0x6b, 0xae, 0x8b, 0x60,
0x30, 0x88, 0x96, 0x99, 0x8b, 0xaa, 0x2c, 0x60,
0x95, 0x28, 0x00, 0x23, 0xe3, 0xb3, 0xe8, 0x99,
0x16, 0xbe, 0xce, 0x2f, 0xf2, 0x7e, 0xe2, 0x03,
0x5b, 0xb2, 0xac, 0xa0, 0x00, 0x08, 0xa9, 0xa9,
0xa9, 0x00, 0x58, 0xe2, 0x31, 0x10, 0x53, 0x30,
0x4c, 0x93, 0xfa, 0xd6, 0x5b, 0x6b, 0x3a, 0x0e,
0x4d, 0x06, 0x89, 0xc5, 0x0d, 0xba, 0x02, 0x83,
0x74, 0x05, 0x06, 0x01, 0x78, 0xdc, 0x71, 0x02,
0x24, 0x91, 0xab, 0x00, 0xa6, 0x98, 0x98, 0x86,
0x49, 0xcf, 0x19, 0x0f, 0x00, 0xcd, 0xc7, 0x8e,
0xe0, 0x71, 0x97, 0xb3, 0xb4, 0x14, 0x21, 0xcf,
0xa6, 0x52, 0xe9, 0xae, 0xa0, 0xa9, 0xa1, 0x1e,
0x80, 0xe3, 0x35, 0xc5, 0x98, 0x86, 0x89, 0x88,
0xfc, 0x16, 0x88, 0x08, 0x76, 0xbb, 0x46, 0x7e,
0x8e, 0x8b, 0x6b, 0xa7, 0xca, 0xe9, 0xeb, 0x7f,
0x40, 0xa9, 0xab, 0x00, 0x15, 0x05, 0x15, 0x05,
0x77, 0x99, 0x93, 0xdb, 0xf7, 0x1e, 0xd1, 0x58,
0x5d, 0xc8, 0xe1, 0xca, 0x0a, 0x32, 0x36, 0x67,
0xac, 0x16, 0x00, 0x84, 0xc3, 0x61, 0x74, 0x5d,
0xc7, 0x99, 0x57, 0x92, 0x94, 0x78, 0x76, 0x15,
0x51, 0xe2, 0xda, 0x46, 0xf7, 0x9d, 0x87, 0x34,
0x56, 0x17, 0x72, 0xb4, 0xca, 0x8d, 0xae, 0xeb,
0x44, 0xa3, 0xd1, 0xe4, 0x13, 0x2d, 0x00, 0xa6,
0x69, 0x12, 0x89, 0x44, 0x00, 0xd0, 0x75, 0x1d,
0x5d, 0xd7, 0xe9, 0x3d, 0x6f, 0xa5, 0xe5, 0x7a,
0x80, 0xe5, 0x98, 0xc1, 0xc9, 0xda, 0x32, 0x9a,
0x0f, 0x1d, 0x40, 0x55, 0x55, 0x42, 0xa1, 0x10,
0x91, 0x48, 0x04, 0x9b, 0xcd, 0x96, 0xf8, 0x07,
0x3e, 0xbf, 0x57, 0x2a, 0xca, 0xf7, 0x22, 0xac,
0x0c, 0xf8, 0x3f, 0x18, 0x7e, 0xf5, 0x32, 0xd1,
0xc0, 0xe3, 0xae, 0x04, 0x91, 0x15, 0x83, 0x92,
0x98, 0xb0, 0x22, 0x20, 0xca, 0xca, 0x36, 0xa1,
0x2f, 0x29, 0x2e, 0x66, 0x7c, 0x7c, 0x0c, 0x41,
0x41, 0xf9, 0x53, 0xe0, 0x70, 0x38, 0x78, 0x3e,
0xf0, 0x2c, 0x19, 0x08, 0xb2, 0xa6, 0xcd, 0xfe,
0xaa, 0x1a, 0x00, 0xb2, 0x1d, 0x0e, 0x10, 0x25,
0x99, 0x5b, 0x00, 0x34, 0x4d, 0x23, 0x3d, 0xdd,
0xfa, 0xcf, 0xba, 0x9a, 0x5d, 0x03, 0xc0, 0xae,
0xd9, 0x57, 0x9d, 0x5b, 0x7e, 0x2d, 0xea, 0x6a,
0x0f, 0xb2, 0x11, 0x14, 0x9f, 0xdf, 0x7b, 0x19,
0x68, 0x63, 0x63, 0xb4, 0xff, 0x04, 0x95, 0xbe,
0xf4, 0xab, 0x3f, 0x7b, 0xb6, 0x9d, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};
/* document_save_as.png - 1728 bytes */
static const unsigned char document_save_as_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
0x4b, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
0x57, 0x59, 0x4c, 0x13, 0x5d, 0x14, 0x3e, 0x33,
0xb4, 0xd3, 0x96, 0xd2, 0x65, 0x5a, 0xa6, 0xb4,
0xc5, 0x5a, 0x5a, 0x4a, 0x45, 0x71, 0x41, 0x4c,
0x55, 0xdc, 0x31, 0xf1, 0x41, 0xa3, 0x44, 0x5f,
0xf4, 0x41, 0x63, 0x4c, 0xf0, 0x45, 0x25, 0x42,
0xdd, 0x30, 0x2e, 0x0f, 0xee, 0xa2, 0xc6, 0x85,
0x08, 0x31, 0x2e, 0x89, 0xbb, 0x92, 0xe8, 0x8b,
0x2f, 0x1a, 0xe3, 0x83, 0xc4, 0x18, 0x91, 0x26,
0x88, 0x8a, 0xc8, 0x52, 0x6a, 0x6d, 0x8a, 0x45,
0x0a, 0x94, 0xd2, 0xe9, 0x0e, 0x9d, 0xff, 0x61,
0x32, 0xff, 0x60, 0x4b, 0xd3, 0xff, 0x47, 0xff,
0xc5, 0x2f, 0x69, 0xee, 0x9c, 0x7b, 0xcf, 0x3d,
0xf7, 0xfb, 0xce, 0x9c, 0x7b, 0xef, 0x14, 0xe0,
0x37, 0x07, 0x92, 0xca, 0xa1, 0xbc, 0xfc, 0xc4,
0x89, 0xaa, 0xaa, 0x1b, 0x37, 0xbe, 0x7e, 0x25,
0x49, 0xb5, 0x7a, 0xed, 0x5a, 0xb7, 0x7b, 0x70,
0x30, 0x12, 0x91, 0xc9, 0x92, 0xf9, 0x0b, 0x04,
0x5c, 0x2e, 0x45, 0xf9, 0xfd, 0x0a, 0x45, 0x46,
0x86, 0xcf, 0xd7, 0xd6, 0x96, 0x95, 0x25, 0x14,
0x7e, 0xfe, 0x6c, 0x36, 0xd7, 0xd4, 0x1c, 0x3e,
0xfc, 0xe8, 0xd1, 0xeb, 0xd7, 0xff, 0x9a, 0x80,
0xda, 0xda, 0x5b, 0xb7, 0xcc, 0xe6, 0xc2, 0xc2,
0xc7, 0x8f, 0xdf, 0xbd, 0xd3, 0xe9, 0x9a, 0x9a,
0x72, 0x72, 0x8c, 0xc6, 0xa9, 0x53, 0xc3, 0x61,
0xad, 0x36, 0x2b, 0x4b, 0xa1, 0x40, 0x51, 0x9f,
0x2f, 0x1a, 0x45, 0x51, 0x3e, 0x3f, 0x3b, 0x5b,
0x2c, 0xe6, 0xf3, 0x51, 0xf4, 0xdb, 0x37, 0x9f,
0x2f, 0x12, 0x01, 0x18, 0x1c, 0x0c, 0x06, 0xc3,
0x61, 0x80, 0xa1, 0xa1, 0x8e, 0x8e, 0x17, 0x2f,
0x6c, 0xb6, 0x40, 0xc0, 0xef, 0x0f, 0x85, 0x78,
0x3c, 0x9d, 0x0e, 0xc7, 0xdb, 0xdb, 0xab, 0xaa,
0xea, 0xea, 0x8e, 0x1c, 0xb9, 0x7f, 0xff, 0xde,
0xbd, 0x5f, 0x25, 0x20, 0x2d, 0x19, 0xf1, 0x17,
0x2f, 0xda, 0xdb, 0x55, 0xaa, 0xc7, 0x8f, 0x27,
0x4f, 0x9e, 0x39, 0x73, 0xd9, 0x32, 0xa9, 0xd4,
0x6e, 0xb7, 0x5a, 0xdb, 0xdb, 0x31, 0xac, 0xbb,
0xdb, 0x6e, 0xb7, 0xdb, 0xb9, 0x5c, 0x87, 0xe3,
0xcb, 0x97, 0xee, 0x6e, 0x14, 0x75, 0x38, 0xfa,
0xfb, 0x07, 0x06, 0x00, 0xb8, 0x5c, 0x91, 0x48,
0x26, 0x03, 0xc0, 0x71, 0x3e, 0x1f, 0xc3, 0x00,
0xf8, 0x7c, 0x82, 0x30, 0x18, 0x70, 0x7c, 0x68,
0x28, 0x18, 0x8c, 0xc5, 0xc4, 0xe2, 0x9e, 0x1e,
0xb7, 0x9b, 0xcf, 0x5f, 0xb9, 0x72, 0xcd, 0x9a,
0xd5, 0xab, 0xe5, 0xf2, 0xe6, 0xe6, 0xa6, 0xa6,
0x97, 0x2f, 0x3f, 0x7d, 0xb2, 0x5a, 0x7f, 0x56,
0x00, 0x1a, 0xdf, 0xf1, 0xf6, 0x6d, 0x57, 0x17,
0x9f, 0x5f, 0x5d, 0x3d, 0x69, 0x52, 0x66, 0x26,
0x87, 0x63, 0xb7, 0x93, 0xa4, 0xd5, 0xfa, 0xfc,
0x79, 0x47, 0xc7, 0xdc, 0xb9, 0x04, 0xd1, 0xd8,
0xb8, 0x69, 0x53, 0x43, 0xc3, 0xf9, 0xf3, 0xdb,
0xb7, 0xa3, 0xe8, 0xe2, 0xc5, 0x5a, 0xad, 0xc5,
0xb2, 0x72, 0x65, 0x34, 0xea, 0xf5, 0xf6, 0xf4,
0x0c, 0x0f, 0x3b, 0x9d, 0xdd, 0xdd, 0xad, 0xad,
0x14, 0xd5, 0xd7, 0x37, 0x3c, 0xec, 0xf3, 0x01,
0xf8, 0x7c, 0x7e, 0x3f, 0x49, 0x02, 0xe0, 0xb8,
0x42, 0xa1, 0x52, 0x01, 0x08, 0x85, 0x0a, 0x85,
0x46, 0xc3, 0xe3, 0x7d, 0xfc, 0xe8, 0x76, 0xcf,
0x9a, 0xf5, 0xf0, 0xe1, 0x9e, 0x3d, 0xc7, 0x8e,
0xad, 0x59, 0x23, 0x14, 0xfe, 0x72, 0x01, 0x1e,
0x4f, 0x20, 0x20, 0x10, 0x18, 0x0c, 0x69, 0x69,
0xa3, 0xa3, 0x24, 0xe9, 0xf5, 0x2e, 0x59, 0x92,
0x97, 0xe7, 0x74, 0xae, 0x58, 0x71, 0xf2, 0xe4,
0xee, 0xdd, 0xd7, 0xaf, 0x3f, 0x78, 0xc0, 0xf8,
0x9d, 0x3e, 0xbd, 0x77, 0xef, 0xdd, 0xbb, 0xcf,
0x9e, 0x99, 0x4c, 0x1a, 0x8d, 0xd3, 0x79, 0xf4,
0x28, 0x49, 0x7a, 0x3c, 0x1e, 0x0f, 0x82, 0xf8,
0xfd, 0xc3, 0xc3, 0x83, 0x83, 0x00, 0x91, 0x48,
0x28, 0x14, 0x08, 0xb0, 0x71, 0x15, 0x0a, 0x8d,
0x26, 0x2f, 0x0f, 0x45, 0x09, 0x42, 0x28, 0x8c,
0x44, 0x1c, 0x8e, 0xfe, 0xfe, 0x48, 0x44, 0xa7,
0xab, 0xab, 0xfb, 0x59, 0x01, 0x09, 0x7b, 0x60,
0xe3, 0xc6, 0x03, 0x07, 0x76, 0xed, 0x7a, 0xf2,
0x44, 0xa7, 0xe3, 0xf1, 0xa2, 0xd1, 0x0f, 0x1f,
0x86, 0x87, 0x3d, 0x9e, 0x58, 0xec, 0xe0, 0xc1,
0x64, 0x01, 0x78, 0x3c, 0x81, 0x00, 0x41, 0x00,
0x5e, 0xbd, 0x1a, 0x1c, 0xd4, 0x6a, 0x01, 0x72,
0x72, 0x0a, 0x0a, 0x8a, 0x8a, 0x92, 0x2f, 0x28,
0x95, 0x06, 0x83, 0x6d, 0x6d, 0x00, 0xfd, 0xfd,
0xdf, 0xbf, 0xf7, 0xf6, 0x02, 0xa8, 0xd5, 0xb1,
0xd8, 0xd0, 0x50, 0x2a, 0x9a, 0x55, 0x55, 0x35,
0x35, 0x17, 0x2f, 0xd6, 0xd6, 0x9e, 0x39, 0x13,
0x3f, 0xc2, 0x89, 0xef, 0xd0, 0x68, 0xc4, 0x62,
0x9f, 0xef, 0xe9, 0xd3, 0x40, 0x60, 0x60, 0x00,
0xc3, 0xea, 0xea, 0x4e, 0x9f, 0x3e, 0x79, 0xf2,
0xec, 0xd9, 0xd4, 0x99, 0x58, 0xbe, 0xdc, 0x6c,
0xae, 0xad, 0x4d, 0xed, 0x17, 0x0a, 0xc9, 0xe5,
0xf3, 0xe6, 0x01, 0x38, 0x9d, 0x36, 0x5b, 0x43,
0x03, 0xc0, 0xed, 0xdb, 0x17, 0x2e, 0x24, 0x4f,
0x0f, 0xc0, 0xfe, 0xfd, 0x07, 0x0e, 0xec, 0xdd,
0x5b, 0x5d, 0x4d, 0x5b, 0x89, 0x02, 0x12, 0x4a,
0x28, 0x10, 0xe8, 0xed, 0xc5, 0xb0, 0xae, 0x2e,
0x1c, 0x97, 0x4a, 0x09, 0x02, 0x20, 0x10, 0x08,
0x04, 0xc6, 0x96, 0x82, 0xdf, 0xef, 0xf7, 0xfb,
0xfd, 0x89, 0x6d, 0x22, 0xd1, 0x60, 0x70, 0xbc,
0xfe, 0xb4, 0x34, 0x2e, 0x17, 0xc3, 0x92, 0xc7,
0x73, 0x38, 0x9c, 0x4e, 0x87, 0x83, 0xb5, 0x09,
0x82, 0x20, 0x08, 0x02, 0x60, 0xe7, 0xce, 0xca,
0xca, 0x1d, 0x3b, 0x0a, 0x0b, 0x53, 0xbe, 0x01,
0x1a, 0xb9, 0xb9, 0x4a, 0xa5, 0x52, 0xa9, 0x52,
0xb1, 0x3d, 0x24, 0x49, 0x6f, 0xca, 0x8c, 0x0c,
0xa1, 0x30, 0x23, 0xe3, 0xaf, 0x67, 0x3c, 0x1e,
0x14, 0x15, 0x8b, 0xc5, 0x62, 0xac, 0xbd, 0x6e,
0xdd, 0xd1, 0xa3, 0xf7, 0xef, 0x03, 0x8c, 0x8c,
0x44, 0x22, 0x91, 0x08, 0x40, 0x7d, 0xfd, 0xc1,
0x83, 0xeb, 0xd7, 0xb3, 0xe3, 0x38, 0x8e, 0xe3,
0x38, 0x0e, 0xe0, 0x76, 0xbb, 0xdd, 0x6e, 0xb7,
0xd1, 0x48, 0xf7, 0xb6, 0xb4, 0x24, 0x7d, 0x03,
0x34, 0x4a, 0x4b, 0x67, 0xcf, 0x9e, 0x35, 0xab,
0xa8, 0x08, 0x20, 0x18, 0x0c, 0x06, 0x83, 0x41,
0x00, 0x04, 0xa1, 0x7f, 0xf1, 0x19, 0xcf, 0xcf,
0x37, 0x99, 0x96, 0x2e, 0x65, 0x5b, 0x89, 0x04,
0xc7, 0x09, 0x82, 0x1d, 0x0f, 0x87, 0xc3, 0xe1,
0x50, 0x68, 0xac, 0x1d, 0x0c, 0xfa, 0x7c, 0x00,
0x06, 0x43, 0x61, 0xe1, 0xfc, 0xf9, 0x00, 0x7a,
0xfd, 0xf4, 0xe9, 0x26, 0x13, 0x3b, 0x9e, 0x9e,
0x2e, 0x10, 0xa4, 0xa7, 0xb3, 0xf6, 0xc2, 0x85,
0xc5, 0xc5, 0x8b, 0x16, 0x31, 0xd6, 0x8c, 0x19,
0xf1, 0x4c, 0x93, 0x08, 0x58, 0xb5, 0x4a, 0xad,
0x56, 0xab, 0xb3, 0xb3, 0x93, 0x67, 0xf2, 0xea,
0xd5, 0x8a, 0x8a, 0x92, 0x12, 0x00, 0xab, 0xf5,
0xfd, 0xfb, 0x37, 0x6f, 0xd8, 0x7e, 0x97, 0xcb,
0xe9, 0xb4, 0xd9, 0xe8, 0x5c, 0x53, 0x14, 0xc0,
0xe8, 0xe8, 0xc8, 0x48, 0x34, 0xca, 0x96, 0x94,
0xcf, 0xe7, 0xf5, 0x7a, 0x3c, 0xac, 0xbf, 0xcd,
0xd6, 0xda, 0x6a, 0xb1, 0x00, 0x5c, 0xbe, 0xbc,
0x7d, 0xfb, 0x82, 0x05, 0x89, 0xeb, 0x68, 0x34,
0x1a, 0x8d, 0x56, 0xcb, 0x58, 0x87, 0x0e, 0x25,
0x15, 0xc0, 0xd4, 0x98, 0x40, 0x40, 0x67, 0x00,
0xc3, 0x30, 0x0c, 0xc3, 0x00, 0xe4, 0x72, 0xb9,
0x5c, 0x2e, 0x4f, 0x0c, 0xac, 0x52, 0x11, 0x84,
0x56, 0x0b, 0x70, 0xfe, 0x7c, 0x59, 0xd9, 0x9c,
0x39, 0x00, 0xed, 0xed, 0x16, 0x4b, 0x43, 0x03,
0x80, 0x4c, 0x46, 0x10, 0x6a, 0x35, 0x40, 0x2c,
0x46, 0x0b, 0x18, 0x5b, 0x3c, 0x14, 0x05, 0x20,
0x16, 0x4b, 0xa5, 0x72, 0x39, 0x80, 0xd5, 0xda,
0xd2, 0xd2, 0xd8, 0xc8, 0xce, 0xd7, 0x6a, 0xd5,
0x6a, 0xa6, 0x40, 0x00, 0x00, 0x84, 0x42, 0xa1,
0x70, 0xec, 0x2d, 0x81, 0xe3, 0x38, 0x2e, 0x97,
0x27, 0xee, 0x85, 0xb8, 0x37, 0x60, 0x34, 0x66,
0x65, 0x29, 0x14, 0x4a, 0x25, 0xdb, 0xe3, 0xf1,
0x78, 0x3c, 0x1e, 0x0f, 0x1b, 0x90, 0x69, 0x51,
0x14, 0x45, 0x51, 0x14, 0x40, 0xa7, 0xcb, 0xce,
0x9e, 0x32, 0x05, 0xa0, 0xa6, 0x66, 0xdb, 0xb6,
0xe2, 0xe2, 0x44, 0x21, 0x28, 0x8a, 0x20, 0x08,
0x02, 0x90, 0x91, 0x21, 0x91, 0xc8, 0x64, 0x2c,
0x71, 0xc6, 0x9f, 0x99, 0x1f, 0x1f, 0x9f, 0x59,
0x97, 0x81, 0x44, 0x22, 0x16, 0x4b, 0x24, 0x2c,
0xcf, 0x24, 0x02, 0x66, 0xcc, 0x98, 0x36, 0x6d,
0xea, 0xd4, 0x82, 0x02, 0x80, 0x68, 0x34, 0x1a,
0x8d, 0x46, 0x29, 0x8a, 0xc3, 0xe1, 0x70, 0xd2,
0xd2, 0x00, 0xbc, 0x5e, 0xaf, 0xd7, 0xeb, 0x65,
0x03, 0x0b, 0x04, 0x02, 0x81, 0x40, 0xc0, 0x2e,
0x38, 0x7d, 0xba, 0xd1, 0x58, 0x54, 0x04, 0x70,
0xed, 0x9a, 0xd9, 0x5c, 0x52, 0xc2, 0x0a, 0x91,
0x4a, 0x33, 0x33, 0x55, 0x2a, 0x00, 0xbb, 0xbd,
0xad, 0xad, 0xb9, 0x99, 0x1d, 0x67, 0xfc, 0xe3,
0x09, 0x33, 0xed, 0xe8, 0xe8, 0xe8, 0xe8, 0xc8,
0x08, 0x00, 0x49, 0x92, 0x24, 0x49, 0x52, 0x54,
0x6e, 0xae, 0x5e, 0x9f, 0x9b, 0xcb, 0xf0, 0x2c,
0x2e, 0x66, 0x9e, 0xfe, 0x3c, 0x85, 0xc2, 0xe1,
0x70, 0x38, 0x1c, 0x9e, 0x39, 0x53, 0xa9, 0x54,
0x2a, 0x95, 0x4a, 0x80, 0x53, 0xa7, 0xaa, 0xab,
0x8f, 0x1f, 0x47, 0x52, 0x7e, 0xad, 0x26, 0x83,
0xc9, 0x24, 0x12, 0x45, 0x22, 0x00, 0x16, 0x8b,
0xc5, 0x02, 0x00, 0x30, 0x77, 0xae, 0x48, 0xd4,
0xd9, 0x09, 0x70, 0xed, 0xda, 0x95, 0x2b, 0x9d,
0x9d, 0x7f, 0x37, 0x1a, 0x82, 0x6c, 0xd9, 0xb2,
0x79, 0x73, 0x59, 0x19, 0x40, 0x28, 0x14, 0x0a,
0x85, 0xc3, 0x22, 0x51, 0x82, 0x00, 0x1e, 0x8f,
0xc7, 0xe3, 0xf1, 0x4a, 0x4b, 0x8d, 0x46, 0xa3,
0x71, 0x6c, 0x2d, 0x56, 0x56, 0x56, 0x54, 0xec,
0xd9, 0x03, 0x80, 0x20, 0x74, 0x0d, 0x53, 0x14,
0x7d, 0x1a, 0xd1, 0x55, 0x4d, 0x07, 0xa7, 0x6d,
0x7a, 0xfc, 0x47, 0xeb, 0x47, 0x12, 0xf4, 0x49,
0xc6, 0xc6, 0x01, 0x00, 0xd0, 0xeb, 0xf5, 0x7a,
0xbd, 0x1e, 0xc0, 0x66, 0xb3, 0xd9, 0x6c, 0x36,
0x76, 0x3e, 0x3d, 0x03, 0xe0, 0xc2, 0x85, 0x4b,
0x97, 0xce, 0x9d, 0x03, 0xc8, 0xcf, 0xcf, 0xcf,
0xcf, 0xcf, 0x07, 0xe0, 0xf3, 0xf9, 0x7c, 0x1e,
0xaf, 0xac, 0x8c, 0xf6, 0xd8, 0xba, 0x35, 0xe1,
0x1e, 0xa0, 0xcf, 0x5b, 0xd6, 0x4e, 0x4f, 0xa7,
0x4b, 0xc5, 0xe1, 0x70, 0x38, 0x1c, 0x8e, 0x89,
0xbe, 0x8f, 0x44, 0x18, 0x0c, 0x06, 0x83, 0xc1,
0xc0, 0xda, 0x32, 0x99, 0x4c, 0x86, 0xe3, 0xf4,
0x33, 0x8a, 0x8e, 0x4d, 0xd0, 0xf8, 0xbc, 0x18,
0xa0, 0x90, 0x02, 0x32, 0x19, 0x8e, 0x27, 0xff,
0xfb, 0x32, 0x71, 0x30, 0x17, 0x14, 0x03, 0x89,
0x44, 0x22, 0x91, 0x4a, 0xe9, 0x56, 0x2c, 0xa6,
0x5b, 0x76, 0xd3, 0x26, 0x07, 0x27, 0x95, 0x03,
0x97, 0x8b, 0x61, 0x5c, 0x2e, 0x80, 0xc9, 0x64,
0x32, 0x8d, 0xbd, 0x70, 0xfe, 0x2f, 0x48, 0x29,
0xa0, 0xa2, 0xc2, 0x6c, 0x2e, 0x2f, 0xff, 0xe7,
0x08, 0xd0, 0xe7, 0xfa, 0xc4, 0xd7, 0x49, 0x10,
0xd0, 0xd7, 0xd7, 0xd7, 0xd7, 0xd7, 0x47, 0x51,
0xbb, 0x77, 0x9b, 0xcd, 0xfb, 0xf6, 0x4d, 0xfc,
0x14, 0xfa, 0xd5, 0x70, 0xb9, 0x5c, 0x2e, 0x97,
0x8b, 0xd9, 0x15, 0x2c, 0x2f, 0xce, 0x58, 0x87,
0xde, 0xde, 0x0d, 0x1b, 0xee, 0xdc, 0xb9, 0x77,
0xef, 0xe6, 0xcd, 0xfa, 0xfa, 0xff, 0x9a, 0xf0,
0xf8, 0x40, 0x10, 0x9a, 0xe7, 0x78, 0x1f, 0x1d,
0xbf, 0x29, 0xfe, 0x00, 0xb1, 0xc5, 0xe7, 0x75,
0x19, 0x76, 0x78, 0x24, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};

193
art/tango/drive_harddisk.h Normal file
View File

@@ -0,0 +1,193 @@
/* drive_harddisk.png - 603 bytes */
static const unsigned char drive_harddisk_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x04, 0x05, 0x0f, 0x35, 0x08, 0xeb,
0xcf, 0x7c, 0x77, 0x00, 0x00, 0x00, 0x8c, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
0x8a, 0xc7, 0x47, 0x00, 0x00, 0x01, 0x50, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x93, 0x4d,
0x6e, 0xc2, 0x30, 0x10, 0x85, 0xbf, 0xa0, 0x40,
0xa4, 0x20, 0xcb, 0xc9, 0x26, 0x6a, 0x24, 0xf6,
0x70, 0x37, 0x24, 0xc4, 0x0d, 0xda, 0xde, 0x90,
0x15, 0x27, 0x40, 0x2c, 0xd8, 0x41, 0x6c, 0x10,
0xf9, 0x99, 0xe9, 0x22, 0xe0, 0x28, 0xed, 0xa2,
0x55, 0x99, 0x85, 0xed, 0x19, 0xcf, 0x7b, 0x7e,
0x33, 0xb6, 0xe1, 0x45, 0x8b, 0x36, 0xdb, 0xf5,
0x07, 0xf0, 0xfe, 0x4f, 0xfc, 0x27, 0x9b, 0xed,
0x5a, 0xff, 0x63, 0xce, 0x39, 0xdd, 0x6c, 0xd7,
0x1a, 0x03, 0x88, 0x08, 0xe7, 0xf3, 0x19, 0x55,
0x85, 0x28, 0x02, 0xd5, 0xb1, 0x4c, 0x40, 0x9f,
0x43, 0x04, 0xa0, 0xcc, 0x66, 0x33, 0x00, 0x62,
0x00, 0x15, 0xa5, 0x13, 0xe9, 0xb3, 0x45, 0x06,
0x00, 0x10, 0x11, 0x21, 0xaa, 0x7d, 0x8c, 0xa8,
0xc7, 0xf7, 0xce, 0x40, 0x20, 0x2a, 0x48, 0x27,
0x44, 0x0f, 0x90, 0x02, 0xa8, 0x3e, 0x00, 0xca,
0x53, 0x18, 0xaa, 0x3d, 0xb1, 0xd0, 0xab, 0x0d,
0x0a, 0x54, 0xc9, 0xf3, 0x8c, 0xd3, 0xe9, 0xf4,
0xa7, 0xce, 0x65, 0x59, 0x46, 0xd7, 0x75, 0x00,
0x4c, 0x9e, 0x41, 0xe7, 0x1c, 0x45, 0x51, 0xfc,
0x0a, 0x2e, 0x8a, 0x82, 0xba, 0xae, 0x83, 0x1f,
0x9a, 0xe8, 0xbd, 0x0f, 0x09, 0x00, 0xd7, 0xeb,
0x95, 0xaa, 0xaa, 0x00, 0x30, 0xc6, 0x90, 0xa6,
0x29, 0x93, 0xc9, 0x84, 0xcb, 0xe5, 0x82, 0xf7,
0x1e, 0x63, 0xcc, 0x40, 0x90, 0x24, 0x09, 0x8b,
0xc5, 0x62, 0x74, 0x92, 0xb5, 0x16, 0x6b, 0x2d,
0x00, 0xde, 0x7b, 0xea, 0xba, 0xe6, 0x76, 0xbb,
0xfd, 0x50, 0x14, 0x03, 0xec, 0x76, 0x3b, 0x9a,
0xa6, 0x19, 0x6d, 0xb4, 0x6d, 0x4b, 0x1c, 0xc7,
0x61, 0xfd, 0xdd, 0xf2, 0x3c, 0x1f, 0xf7, 0xa0,
0x6d, 0x5b, 0xf6, 0xfb, 0x3d, 0xc7, 0xe3, 0x91,
0xaa, 0xaa, 0x50, 0x55, 0x54, 0x95, 0x24, 0x49,
0x38, 0x1c, 0x0e, 0x18, 0x63, 0xc2, 0xec, 0x9c,
0xc3, 0x39, 0x37, 0x10, 0xa8, 0x2a, 0x22, 0xc2,
0x7c, 0x9e, 0x32, 0x9d, 0x4e, 0xc3, 0x23, 0x01,
0x68, 0x9a, 0x06, 0x95, 0x9e, 0x4c, 0x45, 0xfa,
0xdc, 0xc7, 0x0d, 0x84, 0x12, 0xb2, 0x2c, 0xc3,
0x5a, 0x4b, 0x59, 0x96, 0x00, 0xdc, 0xef, 0x77,
0x80, 0xd0, 0xed, 0xe5, 0x6a, 0x89, 0x88, 0xb0,
0x5c, 0xad, 0x10, 0x11, 0xde, 0xca, 0x32, 0x94,
0xfc, 0xfa, 0x67, 0x7a, 0xd5, 0xbe, 0x00, 0x97,
0x55, 0xed, 0x26, 0xb6, 0x6c, 0xb5, 0x0b, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};
/* drive_harddisk.png - 881 bytes */
static const unsigned char drive_harddisk_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x02,
0xfc, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x4d, 0x4b, 0xeb, 0x40, 0x14, 0xbd, 0x93,
0xa4, 0x4d, 0xd3, 0xa4, 0x36, 0x21, 0xb4, 0xa6,
0x95, 0x2a, 0xb5, 0x35, 0xa4, 0x96, 0xd6, 0x8f,
0x5d, 0xd5, 0x5f, 0xe0, 0xa2, 0x5b, 0x7f, 0x80,
0x82, 0x0b, 0x41, 0xdc, 0x88, 0x22, 0xae, 0xc5,
0x8f, 0x8d, 0x08, 0x82, 0xd0, 0x8d, 0x20, 0x2e,
0xf4, 0x47, 0x89, 0x16, 0x21, 0xd2, 0x12, 0x42,
0x4b, 0xd2, 0x4f, 0xdb, 0xbc, 0x45, 0x18, 0xf3,
0x48, 0xed, 0xb3, 0x4f, 0xeb, 0xf3, 0x2d, 0x7a,
0x20, 0x24, 0x67, 0x26, 0x93, 0x39, 0xe7, 0xde,
0xb9, 0x33, 0x04, 0x60, 0x84, 0x11, 0xbe, 0x04,
0xd4, 0xaf, 0x63, 0x7b, 0x7b, 0x67, 0x67, 0x6b,
0x6b, 0x73, 0xd3, 0x66, 0x57, 0x57, 0x3f, 0x2b,
0x73, 0x6f, 0xef, 0xe2, 0xe2, 0xfc, 0xfc, 0xf2,
0xf2, 0xf4, 0xd4, 0xdd, 0x43, 0xbd, 0x2f, 0x3c,
0x12, 0xc1, 0xc2, 0x8f, 0x8f, 0x8f, 0x8e, 0xce,
0xce, 0x7e, 0x4e, 0xfa, 0xfe, 0xfe, 0xc1, 0xc1,
0xee, 0xee, 0xc9, 0x89, 0xcd, 0x7a, 0x0d, 0x10,
0xef, 0x0f, 0x4b, 0xa7, 0x43, 0xa1, 0x50, 0x28,
0x14, 0x02, 0xa8, 0xd5, 0x6a, 0xb5, 0x5a, 0xcd,
0xe9, 0x31, 0x4d, 0xd3, 0x34, 0xcd, 0xef, 0xbb,
0x17, 0x8b, 0xcf, 0xcf, 0xc5, 0xa2, 0xc3, 0xb1,
0x0e, 0x3b, 0xb0, 0xf3, 0xf3, 0x03, 0x1a, 0x48,
0x24, 0x24, 0x49, 0x92, 0x70, 0x1e, 0x00, 0x00,
0x0c, 0xc3, 0x34, 0x0d, 0x03, 0x80, 0x65, 0x59,
0x96, 0x65, 0x87, 0x1f, 0x69, 0x4d, 0xd3, 0x75,
0x4d, 0x03, 0x60, 0x18, 0x9f, 0x8f, 0x61, 0x9c,
0x76, 0x41, 0x10, 0x04, 0x41, 0xc0, 0x4c, 0x96,
0x07, 0x34, 0x90, 0xcf, 0x2f, 0x2c, 0xcc, 0xcd,
0x2d, 0x2e, 0x02, 0xd4, 0xeb, 0xf5, 0x7a, 0xbd,
0x0e, 0x80, 0x90, 0x7d, 0xe1, 0xc8, 0x0c, 0x1b,
0x3c, 0x1f, 0x0c, 0xf2, 0x3c, 0x80, 0xdf, 0xcf,
0x30, 0x7e, 0xbf, 0xd3, 0xbe, 0xbc, 0x9c, 0xcb,
0xad, 0xac, 0x60, 0x96, 0xc9, 0x0c, 0x68, 0x60,
0x75, 0x35, 0x1a, 0x8d, 0x46, 0x27, 0x26, 0x86,
0x2f, 0xb4, 0x1f, 0x48, 0x92, 0x20, 0x48, 0xb2,
0xb7, 0x3d, 0x16, 0x8b, 0xc5, 0xa6, 0xa6, 0x30,
0x3b, 0x3c, 0xec, 0x6b, 0x00, 0xaf, 0x31, 0x86,
0xb1, 0x23, 0xe0, 0xf5, 0x7a, 0xbd, 0x5e, 0x2f,
0x80, 0x28, 0x8a, 0xa2, 0x28, 0xfe, 0x3b, 0x23,
0x18, 0xee, 0xa5, 0x2a, 0x08, 0x82, 0x20, 0x8a,
0xbd, 0xb5, 0xe0, 0xca, 0x80, 0x2c, 0x8f, 0x8f,
0x87, 0xc3, 0x92, 0xe4, 0xb4, 0xe8, 0xba, 0xae,
0xeb, 0xba, 0xf3, 0x41, 0x7c, 0x27, 0x08, 0x82,
0x20, 0x08, 0x18, 0x1a, 0xdc, 0xdf, 0xc7, 0xf3,
0x62, 0x04, 0x83, 0x63, 0x63, 0xc1, 0xa0, 0xa3,
0x13, 0x3f, 0xb9, 0xb6, 0xd1, 0x4c, 0x66, 0x76,
0x36, 0x95, 0x4a, 0xa7, 0x01, 0xda, 0xed, 0x76,
0xbb, 0xdd, 0xb6, 0x2c, 0x8a, 0xa2, 0x28, 0x92,
0x44, 0xa8, 0x52, 0xa9, 0x54, 0x2a, 0x15, 0x80,
0x6e, 0xb7, 0xdb, 0xed, 0x76, 0xdd, 0xc5, 0xf5,
0x75, 0xb8, 0x05, 0x77, 0x3a, 0x9d, 0xce, 0xeb,
0x2b, 0x80, 0x61, 0x18, 0x46, 0xbb, 0x6d, 0x59,
0x89, 0xc4, 0xf4, 0x74, 0x22, 0x81, 0xd0, 0xe3,
0xe3, 0xd3, 0xd3, 0xc3, 0x43, 0x2e, 0x67, 0xbf,
0x75, 0x7f, 0xff, 0x66, 0xa0, 0xd9, 0x6c, 0x36,
0x9b, 0xcd, 0x6c, 0x56, 0x92, 0x24, 0x49, 0x92,
0x00, 0x38, 0x8e, 0xe3, 0x38, 0x0e, 0xa1, 0x6a,
0xb5, 0x5a, 0xad, 0x56, 0x3f, 0x9e, 0x70, 0x58,
0xc0, 0xc2, 0xed, 0x2d, 0x03, 0x07, 0x0a, 0xa1,
0x58, 0x2c, 0x16, 0x9b, 0x9c, 0x04, 0x68, 0x34,
0x1a, 0x8d, 0x66, 0x33, 0x10, 0xe8, 0xc9, 0x00,
0x4d, 0xd3, 0x34, 0x4d, 0xe7, 0xf3, 0xb2, 0x2c,
0xcb, 0xbf, 0x6f, 0x56, 0xc3, 0x8e, 0xf4, 0x67,
0xa1, 0x28, 0x8a, 0xa2, 0x28, 0x00, 0x3e, 0x9f,
0xcf, 0x47, 0xd3, 0xeb, 0xeb, 0x76, 0xeb, 0xc6,
0x46, 0xcf, 0x49, 0x5c, 0x2e, 0x97, 0xcb, 0xe5,
0x32, 0x80, 0xa6, 0x69, 0x9a, 0xa6, 0xfd, 0xfd,
0x44, 0x96, 0x65, 0x59, 0x96, 0x35, 0xfc, 0x71,
0xf8, 0x40, 0x73, 0x83, 0xea, 0x37, 0xa0, 0xd5,
0x6a, 0xb5, 0x5a, 0x2d, 0x80, 0x6c, 0x36, 0x9b,
0xcd, 0x66, 0x01, 0x0a, 0x85, 0x42, 0xa1, 0x50,
0xc0, 0x99, 0x02, 0x60, 0x59, 0x8e, 0xf3, 0xfb,
0x01, 0x02, 0x01, 0x8e, 0x1b, 0x1b, 0x73, 0x8a,
0x9a, 0x61, 0x18, 0x86, 0x61, 0x00, 0x10, 0x42,
0x08, 0x21, 0x87, 0xdb, 0x4b, 0xd2, 0x59, 0x7a,
0xe1, 0x70, 0x38, 0x1c, 0x0e, 0x03, 0x94, 0x4a,
0xa5, 0x52, 0xa9, 0xf4, 0x31, 0xef, 0x67, 0x60,
0xe0, 0x7d, 0x84, 0x24, 0x49, 0x92, 0x24, 0x9d,
0x48, 0x11, 0x04, 0x42, 0x24, 0x89, 0x6b, 0xc7,
0x31, 0x8c, 0xfb, 0x3d, 0x1e, 0x8f, 0xc7, 0xe3,
0xf9, 0x7c, 0x46, 0x06, 0x05, 0x35, 0xe8, 0x8b,
0xa9, 0x54, 0x2a, 0xa5, 0x28, 0xb6, 0x20, 0x00,
0x00, 0x8a, 0xa2, 0x28, 0xea, 0x0f, 0xa3, 0xf1,
0x39, 0xf2, 0xdd, 0xe8, 0x91, 0x60, 0xa7, 0xcc,
0xb2, 0x22, 0x91, 0x48, 0x24, 0x12, 0x41, 0x08,
0xd7, 0x44, 0x32, 0x99, 0x4c, 0xce, 0xcc, 0x7c,
0x7d, 0x42, 0x9e, 0xe7, 0x79, 0x9e, 0x77, 0x78,
0x3c, 0x1e, 0x8f, 0xc7, 0xe3, 0x1f, 0x73, 0x55,
0x55, 0x55, 0x55, 0xc5, 0xb9, 0x44, 0x6f, 0xbf,
0x01, 0x6f, 0x06, 0x54, 0x55, 0x55, 0x5f, 0x5e,
0xd6, 0xd6, 0x6e, 0x6e, 0x6e, 0x6f, 0xaf, 0xaf,
0xef, 0xee, 0xbe, 0x3f, 0x76, 0x9f, 0x01, 0x42,
0xb6, 0xce, 0xa5, 0xa5, 0x9f, 0x56, 0x32, 0xc2,
0x08, 0xff, 0x0b, 0x7e, 0x01, 0xa0, 0xaf, 0x82,
0x1b, 0x07, 0x0a, 0xd5, 0xef, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82};

287
art/tango/drive_optical.h Normal file
View File

@@ -0,0 +1,287 @@
/* drive_optical.png - 720 bytes */
static const unsigned char drive_optical_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x04, 0x05, 0x11, 0x07, 0x15, 0x73,
0x01, 0xca, 0xa5, 0x00, 0x00, 0x00, 0x8c, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
0x8a, 0xc7, 0x47, 0x00, 0x00, 0x01, 0xc5, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x92, 0x4d,
0x6b, 0x13, 0x51, 0x14, 0x86, 0x9f, 0x33, 0x99,
0x66, 0x16, 0xc3, 0xe0, 0x64, 0x60, 0x16, 0x53,
0x9d, 0x2c, 0xfc, 0xf8, 0x03, 0x45, 0xd4, 0x8d,
0x28, 0x6e, 0x0a, 0x22, 0xea, 0x5a, 0x5d, 0xb8,
0x95, 0x48, 0xc8, 0x3f, 0xd0, 0x82, 0x50, 0x44,
0x84, 0x58, 0x68, 0x45, 0x41, 0x11, 0x11, 0x44,
0xff, 0x81, 0x4a, 0xd6, 0xd9, 0x68, 0x49, 0xb4,
0x26, 0xa8, 0xcb, 0x66, 0x19, 0x21, 0xd0, 0x84,
0x04, 0x92, 0xb9, 0xc7, 0xc5, 0xa4, 0xcd, 0x04,
0xe9, 0x22, 0x3d, 0xab, 0xc3, 0xb9, 0xe7, 0x3e,
0xef, 0x7b, 0xee, 0x3d, 0x52, 0xae, 0x94, 0x1e,
0x02, 0x0f, 0x38, 0x5a, 0xac, 0x51, 0xae, 0x94,
0xf4, 0x28, 0xd1, 0xef, 0xf7, 0xb5, 0x5c, 0x29,
0xa9, 0x0d, 0x60, 0x8c, 0xa1, 0xd7, 0xeb, 0x2d,
0x24, 0x9d, 0x77, 0xf2, 0x00, 0xd8, 0x00, 0x6a,
0x14, 0x35, 0x0a, 0xb2, 0x00, 0x41, 0x99, 0x01,
0x8c, 0x1a, 0x8c, 0x2a, 0xe8, 0x14, 0x32, 0x3d,
0x4c, 0xd3, 0xff, 0x0a, 0xe9, 0x7d, 0xd5, 0x8c,
0x03, 0x55, 0x8c, 0x49, 0x00, 0x41, 0xd0, 0x83,
0x4e, 0x9d, 0xf5, 0x83, 0x80, 0x98, 0x8c, 0x81,
0x2c, 0x60, 0xdf, 0x85, 0x00, 0x46, 0x01, 0x91,
0x99, 0xa0, 0xea, 0x01, 0xd8, 0x48, 0x96, 0x98,
0x1d, 0xc1, 0x18, 0x34, 0xd1, 0x54, 0x53, 0x04,
0x55, 0x45, 0x54, 0x51, 0xd9, 0x57, 0x13, 0x44,
0x14, 0xd5, 0x43, 0x46, 0x70, 0x1c, 0x87, 0xe5,
0xe3, 0xcb, 0x87, 0xbe, 0xd7, 0x60, 0x30, 0x00,
0x60, 0x38, 0x1c, 0x02, 0x30, 0x1a, 0x8d, 0xe6,
0x1d, 0x34, 0x1a, 0x0d, 0xc6, 0xe3, 0xf1, 0x42,
0xdf, 0xe8, 0x79, 0x5e, 0x0a, 0x30, 0x89, 0x21,
0x9f, 0xcf, 0xf3, 0xe6, 0xed, 0xab, 0x85, 0x00,
0x97, 0x2e, 0x5e, 0x49, 0x01, 0x62, 0x09, 0xed,
0x76, 0x0b, 0x80, 0xa7, 0x4f, 0xaa, 0x4c, 0x26,
0x13, 0x46, 0xa3, 0x21, 0xdd, 0xbf, 0x5d, 0x9a,
0xcd, 0x06, 0xb6, 0xbd, 0xc4, 0x8d, 0xeb, 0x37,
0xa9, 0xd5, 0x6a, 0x04, 0x41, 0x40, 0x14, 0x45,
0xac, 0x3f, 0x7e, 0x44, 0x10, 0x04, 0x53, 0x80,
0x08, 0xbe, 0xef, 0x13, 0x86, 0x21, 0xdb, 0xdb,
0x5f, 0x59, 0x59, 0x39, 0x8b, 0xef, 0x17, 0xf0,
0xfd, 0x02, 0xa7, 0x4f, 0x9d, 0x01, 0xa0, 0x5e,
0xaf, 0xe3, 0xba, 0x2e, 0x61, 0x18, 0xf2, 0xf9,
0xcb, 0x27, 0x1c, 0xc7, 0xc1, 0x75, 0x5d, 0x00,
0x72, 0xe7, 0x2f, 0x9c, 0x93, 0xdf, 0x7f, 0x7e,
0x5d, 0xde, 0xdb, 0xeb, 0xb3, 0xf3, 0xf3, 0x07,
0xbe, 0xef, 0x53, 0x8c, 0x8b, 0x00, 0x74, 0x3a,
0x1d, 0xba, 0xdd, 0x2e, 0x9e, 0xe7, 0x11, 0x45,
0x11, 0x1f, 0x3e, 0xbe, 0xa7, 0xd5, 0xde, 0x21,
0x49, 0x12, 0x9a, 0xdf, 0x1b, 0x88, 0xc8, 0xda,
0xdc, 0xf2, 0x96, 0xee, 0xdf, 0xbb, 0x96, 0xb3,
0xad, 0x67, 0xf1, 0x89, 0xf8, 0xe4, 0xea, 0xea,
0x55, 0x8a, 0x71, 0x8c, 0x65, 0xe5, 0xd8, 0xed,
0xec, 0x9a, 0x17, 0x2f, 0xb7, 0x2c, 0xa0, 0x05,
0xac, 0x6f, 0x54, 0x37, 0xdf, 0x65, 0xf6, 0x8b,
0x6c, 0x6e, 0xdd, 0xbe, 0x73, 0x6b, 0xa9, 0x10,
0x1c, 0x7b, 0x6e, 0x59, 0xd6, 0xdd, 0xb9, 0xd5,
0x57, 0x7d, 0x2d, 0x22, 0x5b, 0x1b, 0xd5, 0xcd,
0x6f, 0xd9, 0xfa, 0x3f, 0xbd, 0x90, 0xec, 0xc4,
0x00, 0x9c, 0x8f, 0x27, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
/* drive_optical.png - 1513 bytes */
static const unsigned char drive_optical_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xeb, 0x00, 0xeb, 0x00, 0xeb, 0x34,
0x28, 0x49, 0x00, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
0x74, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x5b, 0x6b, 0x13, 0x5b, 0x14, 0xfe, 0x26,
0x99, 0x5c, 0x66, 0xd2, 0x26, 0xe6, 0xd6, 0x26,
0x29, 0x69, 0x92, 0xb6, 0x84, 0x6a, 0x5b, 0x6f,
0x4f, 0x4d, 0xeb, 0x4b, 0xab, 0xad, 0x20, 0x28,
0x22, 0x88, 0xb4, 0x8a, 0x2f, 0x0a, 0x2a, 0x15,
0xf1, 0x45, 0x14, 0xf1, 0x41, 0x11, 0xc4, 0xcb,
0x8b, 0x88, 0xb5, 0x7d, 0x54, 0x6a, 0x43, 0xfc,
0x01, 0x82, 0x94, 0xb6, 0x5e, 0x1a, 0x6b, 0xbd,
0x80, 0xa5, 0x22, 0x48, 0x93, 0xa7, 0x48, 0x8d,
0x26, 0x0d, 0x3a, 0x6d, 0x9a, 0xa6, 0xb9, 0x9e,
0x87, 0xed, 0x76, 0xa6, 0x4d, 0x7a, 0x1a, 0x7b,
0x0e, 0xc8, 0x81, 0xb3, 0x20, 0xec, 0xcc, 0xde,
0xd9, 0xb3, 0xbf, 0x6f, 0xad, 0x6f, 0xad, 0xbd,
0x02, 0xfc, 0xc7, 0x8d, 0x59, 0x6d, 0xe1, 0xcc,
0x99, 0xb3, 0x67, 0x7b, 0x7a, 0x4e, 0x9c, 0x20,
0x4f, 0xfd, 0xfd, 0x7f, 0x16, 0xe6, 0xf9, 0xf3,
0x77, 0xee, 0xdc, 0xbe, 0xdd, 0xdb, 0x7b, 0xf3,
0xe6, 0xca, 0x15, 0xb6, 0x38, 0x70, 0xab, 0x95,
0x02, 0xbf, 0x7e, 0xfd, 0xda, 0xb5, 0x5b, 0xb7,
0x80, 0x6c, 0x36, 0x9b, 0xcd, 0x66, 0x81, 0x7c,
0x3e, 0x9f, 0xcf, 0xe7, 0x4b, 0xf0, 0x0c, 0xc3,
0x30, 0xe2, 0xf7, 0xdf, 0x87, 0x2c, 0x97, 0xcb,
0xe5, 0x72, 0x39, 0x70, 0xe1, 0xc2, 0xc5, 0x8b,
0xe7, 0xce, 0xdd, 0xb8, 0x41, 0x66, 0x0b, 0x09,
0xc8, 0x8a, 0x6f, 0x6f, 0x68, 0x30, 0x9b, 0xcd,
0x66, 0xb3, 0x19, 0x48, 0x24, 0x12, 0x89, 0x44,
0x02, 0x58, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x04,
0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0xd6, 0x1e,
0x93, 0xc9, 0x64, 0x92, 0x8e, 0xc9, 0x64, 0xe9,
0x23, 0x3d, 0x6f, 0x61, 0x61, 0x61, 0x61, 0x61,
0x01, 0xa0, 0x38, 0x88, 0x63, 0xb7, 0x6e, 0x2d,
0x91, 0x40, 0x6d, 0xad, 0xc5, 0x62, 0xb1, 0xd0,
0x38, 0x00, 0x40, 0x2e, 0x97, 0xcb, 0xe5, 0x72,
0xd2, 0x08, 0x90, 0xb1, 0xf0, 0x53, 0x4a, 0x7c,
0xfe, 0x3e, 0x72, 0x0c, 0x23, 0x9e, 0xa3, 0xd7,
0xeb, 0xf5, 0x7a, 0x3d, 0x5d, 0x75, 0xbb, 0x4b,
0x24, 0xb0, 0x6f, 0xdf, 0xb6, 0x6d, 0x5b, 0xb6,
0x6c, 0xdf, 0x2e, 0x7a, 0x5e, 0x04, 0x48, 0x88,
0xe4, 0x72, 0xf9, 0x3c, 0x21, 0x44, 0x89, 0x89,
0x04, 0xa5, 0xeb, 0x94, 0x78, 0x2e, 0x97, 0xcb,
0xe5, 0xf3, 0x64, 0x5e, 0xfa, 0x1e, 0x0a, 0x74,
0x35, 0x69, 0xb6, 0xb6, 0x7a, 0x3c, 0x3b, 0x76,
0xd0, 0xa7, 0xa6, 0xa6, 0x12, 0x09, 0xec, 0xd9,
0x63, 0xb3, 0xd9, 0x6c, 0x55, 0x55, 0xd2, 0x39,
0xf2, 0x7a, 0x72, 0xa8, 0x14, 0x08, 0x8d, 0x87,
0x08, 0x90, 0x12, 0xa2, 0xeb, 0x52, 0x62, 0x52,
0x82, 0xe4, 0xf7, 0x22, 0xc1, 0x62, 0xfb, 0xec,
0x76, 0xbb, 0xdd, 0xe1, 0xa0, 0x18, 0x2e, 0x5d,
0x5a, 0x95, 0x00, 0xd5, 0x18, 0xc7, 0x71, 0x1c,
0xcf, 0x03, 0x4a, 0xa5, 0x52, 0xa9, 0x54, 0x02,
0x2a, 0x95, 0x5a, 0xad, 0x52, 0x49, 0x01, 0xd0,
0x03, 0xc4, 0x51, 0x0a, 0x88, 0x52, 0x12, 0x23,
0xb0, 0xdc, 0xc3, 0x52, 0x29, 0xae, 0x8c, 0x80,
0x74, 0x9e, 0x61, 0x64, 0x32, 0x99, 0xc4, 0xbd,
0x7a, 0xbd, 0x5e, 0x6f, 0x34, 0x16, 0xe6, 0xc2,
0x8a, 0x08, 0xb8, 0xdd, 0x95, 0x95, 0x15, 0x15,
0x16, 0x8b, 0x38, 0x93, 0x4a, 0xa5, 0x52, 0xa9,
0xd4, 0x72, 0xcf, 0xd0, 0x6a, 0xb4, 0xdc, 0x73,
0xc5, 0x9f, 0x45, 0x82, 0xb9, 0x5c, 0x36, 0x4b,
0x63, 0xb5, 0x9c, 0xe0, 0xf2, 0x88, 0x90, 0xe7,
0x4c, 0x26, 0x9d, 0x4e, 0xa7, 0x45, 0x1c, 0x3a,
0x9d, 0x56, 0xab, 0xd3, 0x15, 0xe6, 0xc2, 0x0a,
0x02, 0x4d, 0x4d, 0x9b, 0x36, 0x6d, 0xdc, 0xd8,
0xd0, 0x00, 0xa4, 0xd3, 0xe9, 0x74, 0x3a, 0x2d,
0x8a, 0x44, 0xaa, 0x69, 0x22, 0xa5, 0xc2, 0x5c,
0x90, 0x7a, 0xba, 0x30, 0x52, 0x62, 0x04, 0x8a,
0x45, 0x50, 0x2a, 0x41, 0xe9, 0x18, 0x8f, 0xc7,
0xe3, 0xf1, 0x78, 0x3e, 0x5f, 0x5b, 0x5b, 0x53,
0x53, 0x5b, 0x4b, 0x71, 0x7a, 0x3c, 0x05, 0x04,
0x48, 0xf9, 0xdb, 0xbc, 0xd9, 0x62, 0xb1, 0x58,
0x2c, 0x16, 0x80, 0xe7, 0x79, 0x9e, 0xe7, 0x19,
0xa6, 0x58, 0x72, 0x15, 0x4b, 0x36, 0x69, 0x25,
0xa2, 0x42, 0x5a, 0x59, 0x9d, 0xc4, 0x35, 0xe9,
0x3e, 0x51, 0x78, 0xc5, 0x92, 0x5b, 0xa7, 0xd3,
0xe9, 0x74, 0x3a, 0x86, 0xb1, 0xdb, 0xed, 0xf6,
0xea, 0x6a, 0x5a, 0x9e, 0xcb, 0xcb, 0xe9, 0xfe,
0x5f, 0x17, 0x99, 0x4a, 0xa5, 0x52, 0xa9, 0x54,
0xfb, 0xf6, 0xb9, 0xdd, 0x6e, 0xb7, 0xb4, 0x58,
0x19, 0x8d, 0x46, 0xa3, 0xc9, 0x84, 0x3f, 0x6e,
0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0xf5, 0x80, 0x5a,
0xad, 0x56, 0xab, 0x54, 0xc7, 0x8e, 0x91, 0xd9,
0xe3, 0xc7, 0x0b, 0x6e, 0xe2, 0x68, 0x34, 0x1a,
0x8d, 0x46, 0x81, 0x58, 0x2c, 0x16, 0x8b, 0xc5,
0x7e, 0xff, 0xa0, 0x52, 0x6f, 0xea, 0xdf, 0xdd,
0x47, 0x2f, 0xb4, 0x95, 0xc6, 0xae, 0xb6, 0x81,
0x26, 0xaf, 0xd7, 0xeb, 0xf3, 0x0d, 0x0c, 0xfc,
0xfb, 0x1e, 0x2d, 0xd5, 0x0e, 0x1c, 0xd8, 0xbf,
0xff, 0xe0, 0xc1, 0x75, 0x10, 0x90, 0xfa, 0x86,
0x61, 0x80, 0xce, 0xce, 0xce, 0xce, 0xdd, 0xbb,
0xc5, 0x2b, 0x3f, 0x93, 0xc9, 0x64, 0x32, 0x19,
0xe0, 0xc7, 0x0f, 0x41, 0xf8, 0xfe, 0x1d, 0x30,
0x18, 0xf4, 0x7a, 0x83, 0x01, 0x98, 0x98, 0x98,
0x98, 0x78, 0xf5, 0x0a, 0xa8, 0xa9, 0x21, 0x49,
0xc7, 0x30, 0x0c, 0x23, 0x93, 0x01, 0x81, 0x40,
0x30, 0x38, 0x3d, 0x0d, 0xb4, 0xb7, 0xb7, 0xb5,
0xed, 0xdc, 0x09, 0x4c, 0x4f, 0x4f, 0x4f, 0x7f,
0xfa, 0x44, 0xca, 0xa3, 0xc1, 0x00, 0xc8, 0x64,
0x32, 0x99, 0x5c, 0x4e, 0x72, 0x8f, 0xe3, 0x00,
0xbf, 0xdf, 0xef, 0xf7, 0xfb, 0xd7, 0x46, 0xb7,
0x26, 0x01, 0x83, 0xc1, 0x60, 0x30, 0x1a, 0x81,
0xc6, 0xc6, 0xc6, 0xc6, 0xa6, 0x26, 0x31, 0xc9,
0x68, 0xcf, 0x33, 0x3b, 0x1b, 0x8b, 0xcd, 0xce,
0x02, 0x1a, 0x8d, 0x46, 0x53, 0x56, 0x06, 0x68,
0xb5, 0x5a, 0xed, 0x86, 0x0d, 0xc0, 0xd0, 0xd0,
0xd0, 0xd0, 0x93, 0x27, 0xa4, 0x9e, 0x33, 0x0c,
0xb0, 0x6b, 0x57, 0x7b, 0x7b, 0x47, 0x07, 0x60,
0x36, 0x57, 0x54, 0x54, 0x54, 0x90, 0x5e, 0x27,
0x1e, 0x07, 0x4c, 0x26, 0xa3, 0xd1, 0x6c, 0x06,
0x14, 0x0a, 0x85, 0x42, 0xa9, 0x04, 0x38, 0x8e,
0xe3, 0xd4, 0x6a, 0x60, 0x6a, 0x6a, 0x6a, 0x6a,
0x6a, 0x6a, 0x1d, 0x04, 0x22, 0x91, 0x48, 0x24,
0x12, 0xc9, 0xe7, 0xad, 0x56, 0xab, 0xd5, 0x6a,
0x65, 0x98, 0xaa, 0x2a, 0x9b, 0xcd, 0x66, 0x03,
0xb2, 0xd9, 0x4c, 0x26, 0x9b, 0x05, 0xaa, 0xab,
0xab, 0xab, 0x69, 0x35, 0x48, 0x26, 0x01, 0x93,
0xc9, 0x64, 0x32, 0x99, 0x80, 0x48, 0x24, 0x1a,
0xfd, 0xf6, 0x0d, 0xf0, 0x78, 0x9a, 0x9b, 0x3d,
0x1e, 0xe2, 0xe9, 0xf6, 0x76, 0xf1, 0xbd, 0xa1,
0x50, 0x28, 0x14, 0x0a, 0x01, 0xa3, 0xa3, 0x4f,
0x9f, 0x0e, 0x0f, 0x03, 0x2e, 0x97, 0xd3, 0x59,
0x53, 0x43, 0x00, 0xf3, 0x3c, 0xad, 0x36, 0x80,
0x20, 0xcc, 0xcd, 0x09, 0x02, 0xe0, 0x74, 0x3a,
0x1c, 0x4e, 0x27, 0xe0, 0x72, 0xb9, 0x5c, 0x2e,
0x17, 0x10, 0x0e, 0x87, 0xc3, 0xe1, 0x30, 0xcd,
0x12, 0xb1, 0xbf, 0xfd, 0x45, 0x20, 0x1c, 0x0e,
0x87, 0xbf, 0x7e, 0x3d, 0x74, 0x68, 0x60, 0x60,
0x70, 0xf0, 0xfe, 0xfd, 0x47, 0x8f, 0x44, 0x01,
0x91, 0xe4, 0x0a, 0x85, 0x3e, 0x7f, 0x0e, 0x85,
0x80, 0x2b, 0x57, 0x2e, 0x5f, 0xbe, 0x7a, 0x95,
0x54, 0x03, 0xb5, 0x1a, 0x60, 0x59, 0x96, 0x65,
0x59, 0xc0, 0x6a, 0x25, 0xed, 0x2f, 0x25, 0x12,
0x0c, 0x06, 0x83, 0x81, 0x80, 0xd8, 0x55, 0xb2,
0x2c, 0xcb, 0x2a, 0x14, 0x22, 0x70, 0x2a, 0x2d,
0x7a, 0x9f, 0x50, 0x47, 0xf8, 0x7c, 0x3e, 0x9f,
0xd7, 0x0b, 0xcc, 0xcd, 0xc5, 0xe3, 0x82, 0x00,
0x7c, 0xf8, 0xf0, 0xf1, 0xa3, 0x18, 0x09, 0x86,
0x21, 0x38, 0x5b, 0x5a, 0x7e, 0xcd, 0x94, 0x9a,
0x4c, 0x3d, 0x3d, 0xa7, 0x4f, 0x9f, 0x3a, 0xd5,
0xd7, 0xd7, 0xd5, 0xd5, 0xd5, 0xd5, 0xdd, 0xbd,
0x77, 0xaf, 0xc7, 0xd3, 0xdc, 0xdc, 0xd2, 0x52,
0x55, 0x45, 0x01, 0xd0, 0x9c, 0xa0, 0xed, 0xb0,
0x20, 0x08, 0x82, 0x20, 0xac, 0xde, 0x36, 0xcf,
0xcf, 0xcf, 0xcf, 0xcf, 0xcf, 0x03, 0x75, 0x75,
0x75, 0x75, 0x75, 0x75, 0xc0, 0xe4, 0xe4, 0xe4,
0xe4, 0xfb, 0xf7, 0x82, 0x30, 0x32, 0x32, 0x3a,
0x3a, 0x3c, 0xec, 0xf3, 0xdd, 0xbb, 0xd7, 0xdb,
0xdb, 0xdf, 0x7f, 0xf2, 0xe4, 0x5a, 0xb8, 0xe4,
0xa5, 0x12, 0x78, 0xfb, 0xf6, 0xcd, 0x9b, 0x77,
0xef, 0x1e, 0x3f, 0xe6, 0x38, 0x9e, 0x57, 0xab,
0x3b, 0x3a, 0x88, 0xe6, 0x4d, 0x26, 0x87, 0xc3,
0xe1, 0x70, 0x38, 0xd4, 0x6a, 0x99, 0x8c, 0xf4,
0x2e, 0xb4, 0x7a, 0x15, 0xb6, 0xdf, 0xc4, 0x38,
0x8e, 0xe3, 0x38, 0x0e, 0x20, 0xfb, 0x80, 0xf1,
0xf1, 0xf1, 0xf1, 0x97, 0x2f, 0x53, 0xa9, 0xe7,
0xcf, 0x5f, 0xbc, 0x78, 0xf6, 0x6c, 0x6c, 0x8c,
0x00, 0xef, 0xea, 0xfa, 0x09, 0x4f, 0x4e, 0x75,
0xf0, 0x8f, 0x09, 0x2c, 0x27, 0x32, 0x38, 0x58,
0x56, 0x56, 0x5e, 0xce, 0xf3, 0x4e, 0xa7, 0xdf,
0xef, 0xf7, 0x8f, 0x8d, 0xb9, 0x5c, 0x95, 0x95,
0x95, 0x95, 0x16, 0x8b, 0x52, 0x49, 0xa4, 0x25,
0x93, 0x69, 0xb5, 0x5a, 0xad, 0x56, 0x2b, 0x02,
0xa6, 0x36, 0x33, 0xf3, 0xe5, 0xcb, 0xcc, 0x4c,
0x36, 0xeb, 0xf5, 0x7a, 0xbd, 0x0f, 0x1f, 0x26,
0x12, 0x81, 0x40, 0x30, 0x18, 0x08, 0x3c, 0x78,
0xd0, 0xdb, 0x7b, 0xf7, 0x6e, 0x5f, 0x1f, 0x05,
0x2e, 0x0a, 0x78, 0x2d, 0x3c, 0xeb, 0xf8, 0xb3,
0x07, 0x88, 0x49, 0xc4, 0xb2, 0x87, 0x0f, 0x1f,
0x39, 0xd2, 0xdd, 0xdd, 0xda, 0xaa, 0xd1, 0x68,
0x34, 0x3c, 0x7f, 0xf4, 0x28, 0xcb, 0xca, 0xe5,
0x2c, 0xdb, 0xd6, 0x46, 0xaa, 0x8f, 0xdd, 0xce,
0xfc, 0x34, 0x12, 0x91, 0x99, 0x19, 0x22, 0xb5,
0x91, 0x11, 0x85, 0x42, 0xa1, 0x50, 0x28, 0xfa,
0xfb, 0x09, 0xf0, 0xd7, 0xaf, 0xd7, 0x87, 0xe3,
0x7f, 0xfb, 0xf3, 0xf6, 0x17, 0xf1, 0x8b, 0x66,
0xcc, 0x3d, 0xb8, 0xf4, 0x62, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82};

View File

@@ -0,0 +1,178 @@
/* drive_removable_media.png - 510 bytes */
static const unsigned char drive_removable_media_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0a, 0x11, 0x12, 0x00, 0x1d, 0x50,
0x96, 0x14, 0xa0, 0x00, 0x00, 0x00, 0x8c, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
0x6e, 0x74, 0x00, 0x4d, 0x65, 0x6e, 0x75, 0x2d,
0x73, 0x69, 0x7a, 0x65, 0x64, 0x20, 0x69, 0x63,
0x6f, 0x6e, 0x0a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x0a, 0x0a, 0x28,
0x63, 0x29, 0x20, 0x32, 0x30, 0x30, 0x33, 0x20,
0x4a, 0x61, 0x6b, 0x75, 0x62, 0x20, 0x27, 0x6a,
0x69, 0x6d, 0x6d, 0x61, 0x63, 0x27, 0x20, 0x53,
0x74, 0x65, 0x69, 0x6e, 0x65, 0x72, 0x2c, 0x20,
0x0a, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
0x6a, 0x69, 0x6d, 0x6d, 0x61, 0x63, 0x2e, 0x6d,
0x75, 0x73, 0x69, 0x63, 0x68, 0x61, 0x6c, 0x6c,
0x2e, 0x63, 0x7a, 0x0a, 0x0a, 0x63, 0x72, 0x65,
0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74,
0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x49,
0x4d, 0x50, 0x2c, 0x0a, 0x68, 0x74, 0x74, 0x70,
0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67,
0x69, 0x6d, 0x70, 0x2e, 0x6f, 0x72, 0x67, 0x67,
0x8a, 0xc7, 0x47, 0x00, 0x00, 0x00, 0xf3, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x93, 0xbf,
0x4a, 0xc3, 0x50, 0x14, 0xc6, 0x7f, 0x29, 0xc9,
0x62, 0xb9, 0x90, 0x0c, 0xf6, 0x21, 0xb2, 0x16,
0xb1, 0x20, 0x76, 0x2f, 0x3a, 0x14, 0x9f, 0xa0,
0x14, 0x9c, 0x94, 0xd2, 0x37, 0x88, 0xbe, 0x85,
0xd2, 0xa1, 0x20, 0x9d, 0x4a, 0xe9, 0x33, 0x48,
0xe9, 0x03, 0x84, 0x90, 0x59, 0x3a, 0x79, 0xa7,
0x2c, 0x81, 0x90, 0xbf, 0x70, 0x3b, 0x48, 0xc8,
0x20, 0x15, 0xd2, 0xeb, 0x37, 0x9f, 0xef, 0x77,
0xbe, 0x73, 0x38, 0x07, 0x34, 0x65, 0xcc, 0xe6,
0x4f, 0x2f, 0x80, 0x77, 0xa6, 0xff, 0xd5, 0x04,
0xbc, 0xe9, 0xe4, 0xb1, 0xb5, 0xb3, 0xaa, 0x2a,
0x3e, 0x56, 0x4b, 0xcf, 0x04, 0x50, 0x4a, 0x11,
0x04, 0x41, 0x2b, 0x80, 0xeb, 0xba, 0x00, 0x74,
0x74, 0x77, 0xd0, 0xa9, 0x13, 0x68, 0x01, 0xce,
0x51, 0xdd, 0x54, 0x7b, 0x04, 0x13, 0xe0, 0x70,
0xf8, 0x42, 0xca, 0xef, 0x56, 0xc6, 0x6e, 0xf7,
0xa2, 0x01, 0x8c, 0xc7, 0x0f, 0x18, 0x86, 0x71,
0xb2, 0x38, 0x49, 0x12, 0x00, 0xd2, 0x34, 0x05,
0x20, 0xcb, 0x32, 0x84, 0x10, 0xec, 0xf6, 0x9f,
0x3f, 0x00, 0xdf, 0xf7, 0x29, 0xcb, 0xb2, 0x55,
0x02, 0x21, 0x44, 0x93, 0xa0, 0xd6, 0x66, 0xbb,
0xa6, 0x77, 0xd9, 0xfb, 0xd3, 0x38, 0xb8, 0x1e,
0xd0, 0xef, 0x5f, 0x11, 0x86, 0x61, 0x03, 0xa8,
0x37, 0x3a, 0x7b, 0x9e, 0x03, 0x60, 0x59, 0xd6,
0x49, 0x80, 0xe3, 0x38, 0xbc, 0x2f, 0xde, 0xb8,
0x1b, 0xdd, 0x37, 0x00, 0xdb, 0xb6, 0x51, 0x4a,
0x91, 0xe7, 0x39, 0x00, 0x71, 0x1c, 0x03, 0x50,
0x14, 0xc5, 0x2f, 0x80, 0x94, 0x92, 0xdb, 0x9b,
0x21, 0x51, 0x14, 0xfd, 0xcf, 0x33, 0xe9, 0x9e,
0x01, 0x47, 0x57, 0x47, 0x4e, 0xf4, 0x9c, 0x50,
0x7b, 0x51, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
/* drive_removable_media.png - 862 bytes */
static const unsigned char drive_removable_media_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x02,
0xe9, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0xbf, 0x4f, 0xea, 0x50, 0x14, 0x3e, 0x85,
0x16, 0x88, 0xe5, 0x57, 0x42, 0x69, 0xa9, 0xd8,
0xa1, 0x92, 0xb2, 0x18, 0x89, 0xac, 0xfe, 0x09,
0x0e, 0x26, 0xc6, 0x44, 0x47, 0x37, 0x1d, 0x4c,
0x8c, 0x83, 0x11, 0x4d, 0xfc, 0x07, 0x74, 0x32,
0x26, 0x26, 0x2e, 0x2f, 0xc1, 0x18, 0x07, 0x1d,
0x4d, 0x8c, 0xff, 0x06, 0x23, 0x0b, 0x91, 0x09,
0xa4, 0x50, 0x03, 0x05, 0x6d, 0xf8, 0x51, 0xfa,
0x86, 0xfb, 0x2e, 0x85, 0x42, 0x95, 0x97, 0xf7,
0x84, 0x85, 0x6f, 0xe0, 0xde, 0x7b, 0xce, 0xb9,
0xf0, 0x7d, 0xe7, 0x9c, 0xdb, 0x5b, 0x00, 0x66,
0x98, 0xe1, 0x9f, 0x40, 0xd8, 0x39, 0x0e, 0x0e,
0x0e, 0x0f, 0xf7, 0xf7, 0xf7, 0xf6, 0xd0, 0xea,
0xe6, 0x66, 0xba, 0x34, 0x53, 0xa9, 0xab, 0xab,
0xcb, 0xcb, 0xeb, 0xeb, 0x8b, 0x0b, 0xab, 0x87,
0x1c, 0x4d, 0x9c, 0xe7, 0x31, 0xf1, 0xcd, 0xcd,
0x8d, 0x8d, 0xad, 0x2d, 0x00, 0x8a, 0xa2, 0x28,
0x8a, 0x9a, 0x3c, 0xf5, 0xe7, 0xe7, 0x97, 0x97,
0xa7, 0xa7, 0xf3, 0x73, 0xb4, 0x1a, 0x43, 0x00,
0xc2, 0xd2, 0x52, 0x2c, 0xb6, 0xb8, 0x28, 0x49,
0xa6, 0x25, 0x9b, 0xcd, 0x66, 0xb3, 0xd9, 0xc9,
0x11, 0x17, 0x04, 0x41, 0x10, 0x04, 0x00, 0x9f,
0xcf, 0xe7, 0xf3, 0xfb, 0x71, 0x62, 0x57, 0x56,
0x50, 0x25, 0x32, 0x19, 0x1c, 0xe7, 0x18, 0xbd,
0x3d, 0x16, 0xa3, 0x69, 0x9a, 0xf6, 0x7a, 0x27,
0x47, 0xd8, 0x8a, 0x56, 0xab, 0xd5, 0x6a, 0xb5,
0x00, 0x82, 0xc1, 0x40, 0x20, 0x18, 0xc4, 0xd6,
0x78, 0xdc, 0x1a, 0x67, 0x23, 0x60, 0x7d, 0x9d,
0xe3, 0x38, 0x8e, 0xe3, 0x00, 0x1a, 0x8d, 0x46,
0xa3, 0xd1, 0x98, 0xbc, 0x80, 0x66, 0xb3, 0xd9,
0x6c, 0x36, 0x01, 0x78, 0x3e, 0x12, 0x89, 0x46,
0x01, 0xc2, 0x61, 0x86, 0xe1, 0xb8, 0x9d, 0x9d,
0x6f, 0x05, 0xcc, 0xcf, 0xf3, 0x7c, 0x34, 0xba,
0xb6, 0xe6, 0x72, 0x51, 0x94, 0xcb, 0x05, 0xa0,
0xaa, 0xaa, 0xaa, 0xaa, 0xd3, 0x13, 0xa0, 0xeb,
0xba, 0xae, 0xeb, 0x00, 0x9d, 0x4e, 0xa7, 0xd3,
0x6e, 0x2f, 0x2f, 0xdb, 0x0a, 0xc0, 0x3d, 0x46,
0xd3, 0x73, 0x73, 0x5e, 0x2f, 0x80, 0xc7, 0xe3,
0xf1, 0x78, 0x3c, 0x00, 0x9a, 0xa6, 0x69, 0x9a,
0x36, 0x79, 0x01, 0xf8, 0x77, 0xdd, 0x6e, 0xb7,
0xdb, 0xed, 0x06, 0x60, 0x98, 0x50, 0x88, 0x65,
0x05, 0x01, 0xf3, 0xc4, 0x71, 0x96, 0x43, 0x1c,
0x8f, 0xfb, 0xfd, 0x7e, 0x7f, 0x20, 0x00, 0x50,
0xaf, 0xd7, 0xeb, 0xf5, 0x3a, 0x52, 0xde, 0xe9,
0x4c, 0x5e, 0x00, 0x86, 0x61, 0x18, 0x86, 0x61,
0x00, 0xd0, 0x34, 0x4d, 0xd3, 0xb4, 0xc9, 0x13,
0x8d, 0x99, 0x4c, 0x4f, 0x00, 0xee, 0x31, 0xdc,
0xfb, 0xf8, 0x10, 0x95, 0xcb, 0xe5, 0xb2, 0x2c,
0x4f, 0x4f, 0x40, 0xb7, 0x6b, 0x18, 0xba, 0x0e,
0x10, 0x89, 0x70, 0x1c, 0xcf, 0xe3, 0x4a, 0xec,
0xee, 0x22, 0xef, 0xe3, 0x63, 0x4f, 0x00, 0x49,
0x3a, 0x9d, 0x24, 0x99, 0x48, 0x48, 0x92, 0x24,
0x49, 0x12, 0x00, 0xc3, 0x30, 0x0c, 0xc3, 0x00,
0x24, 0x93, 0xc9, 0xa4, 0x59, 0xb0, 0x71, 0x40,
0x10, 0x04, 0x81, 0x73, 0x67, 0xef, 0x45, 0xf3,
0xd1, 0x51, 0xc8, 0x82, 0x22, 0xbd, 0x5e, 0xf4,
0x34, 0x2c, 0x14, 0x0a, 0x85, 0x42, 0x01, 0x20,
0x97, 0xcb, 0xe5, 0x72, 0xb9, 0x44, 0xa2, 0xc7,
0x1b, 0x4f, 0x3e, 0x3f, 0x35, 0xed, 0xe3, 0x63,
0x61, 0x81, 0xe7, 0x79, 0x1e, 0x5f, 0x63, 0x00,
0x00, 0xa1, 0x50, 0x28, 0xc4, 0x30, 0xd3, 0xab,
0x00, 0x86, 0x28, 0x8a, 0xa2, 0x28, 0x02, 0x54,
0xab, 0xb5, 0xda, 0xfb, 0x7b, 0x38, 0x3c, 0x24,
0xa0, 0x56, 0x53, 0xd5, 0x6a, 0x15, 0xb5, 0x4c,
0xb9, 0x0c, 0xa0, 0x28, 0x8a, 0xa2, 0x28, 0x83,
0xb9, 0xc3, 0x9f, 0x04, 0xd1, 0x6f, 0x75, 0x38,
0xf0, 0x7a, 0xd0, 0x87, 0x32, 0x68, 0xb7, 0x36,
0xe7, 0xd8, 0x3e, 0x58, 0x99, 0xfe, 0x35, 0x80,
0xf5, 0x0c, 0x98, 0xb0, 0xb9, 0x89, 0x87, 0x91,
0x4e, 0xdf, 0xde, 0xfe, 0xfa, 0xf5, 0x73, 0x19,
0x3e, 0x3e, 0x3e, 0x3a, 0x3a, 0x3d, 0xfd, 0xfe,
0xb1, 0x8d, 0x13, 0xfd, 0x17, 0x02, 0x50, 0x2e,
0x4e, 0x4e, 0x52, 0xa9, 0xb3, 0xb3, 0xc1, 0xec,
0x0f, 0x47, 0x0e, 0x67, 0x6e, 0x94, 0x1f, 0x77,
0x7d, 0x7f, 0x64, 0xa5, 0xa2, 0x28, 0x95, 0x8a,
0xd9, 0xf3, 0x18, 0xf9, 0x7c, 0x3e, 0xff, 0xfa,
0x8a, 0x2a, 0x20, 0x8a, 0xc3, 0xdf, 0xf9, 0x85,
0x80, 0xc1, 0x92, 0x97, 0x4a, 0xa5, 0x52, 0xa9,
0x34, 0xba, 0x05, 0xcc, 0xe8, 0x7e, 0x62, 0xd6,
0x96, 0xb1, 0xf7, 0x63, 0x61, 0x04, 0x61, 0x12,
0x1e, 0x17, 0x43, 0x02, 0x64, 0x59, 0x96, 0x65,
0xd9, 0x30, 0x58, 0x96, 0x65, 0x59, 0xf6, 0xab,
0x7c, 0xff, 0x0c, 0xec, 0x32, 0x5d, 0x2c, 0x16,
0x8b, 0xc5, 0xe2, 0x70, 0xed, 0xc8, 0xfe, 0x80,
0xb7, 0xb7, 0xed, 0xed, 0xbb, 0xbb, 0xfb, 0xfb,
0x74, 0xfa, 0xe1, 0x61, 0xd2, 0xc4, 0xc7, 0x03,
0x41, 0x20, 0x9e, 0xab, 0xab, 0x3d, 0xcb, 0x77,
0x1b, 0xd0, 0xe8, 0xf8, 0xf3, 0xca, 0xe1, 0x74,
0xa2, 0x11, 0xff, 0x33, 0xb0, 0x8e, 0x24, 0x39,
0x18, 0x67, 0xad, 0x20, 0xce, 0xa0, 0xae, 0xa3,
0x11, 0xdf, 0xf1, 0xed, 0xf6, 0xe8, 0x11, 0xc7,
0x75, 0xbb, 0x83, 0xfb, 0x67, 0x98, 0xe1, 0xbf,
0xe1, 0x37, 0x5a, 0x8c, 0x28, 0xe4, 0xc5, 0xfe,
0xbe, 0x74, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};

197
art/tango/edit_copy.h Normal file
View File

@@ -0,0 +1,197 @@
/* edit_copy.png - 498 bytes */
static const unsigned char edit_copy_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0a, 0x1a, 0x14, 0x08, 0x2f, 0x83,
0x14, 0x34, 0x9b, 0x00, 0x00, 0x01, 0x7f, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0x4b,
0x4b, 0x02, 0x51, 0x18, 0x86, 0xdf, 0x23, 0x33,
0x63, 0xda, 0x80, 0xfd, 0x0a, 0xcf, 0x08, 0xdd,
0x16, 0xfd, 0x8f, 0x08, 0x5a, 0xb6, 0x88, 0xa0,
0x75, 0x17, 0xf0, 0x42, 0xb6, 0xb0, 0x45, 0x91,
0x76, 0xdb, 0x44, 0x44, 0x44, 0x1b, 0xb1, 0x36,
0x05, 0xfe, 0x04, 0x31, 0xb3, 0x36, 0x81, 0x65,
0x30, 0xa3, 0xbf, 0xa0, 0x9a, 0x30, 0x05, 0x37,
0xcd, 0xed, 0xb4, 0x69, 0x74, 0x46, 0x47, 0xb1,
0x6f, 0xf5, 0x9d, 0xc3, 0x79, 0x1f, 0xde, 0xf7,
0xe3, 0x3b, 0xe4, 0xe8, 0x24, 0x33, 0xaf, 0xeb,
0xfa, 0x2c, 0x46, 0x28, 0xc1, 0xcf, 0xbd, 0x6d,
0xae, 0xc5, 0xef, 0x9c, 0x77, 0x9c, 0x61, 0x18,
0xd3, 0xf1, 0xe8, 0xd6, 0x28, 0x7a, 0xa4, 0x0f,
0xf6, 0x26, 0x01, 0xb8, 0x01, 0x76, 0xd3, 0x6a,
0x35, 0xc1, 0x18, 0xeb, 0x13, 0x11, 0x42, 0x00,
0x00, 0xa1, 0xd0, 0x84, 0x27, 0x94, 0x73, 0x1e,
0x6a, 0xb5, 0x1a, 0x5e, 0xab, 0x95, 0x85, 0xc6,
0x77, 0x63, 0x66, 0x90, 0x8b, 0xfd, 0xcc, 0x6e,
0xca, 0xee, 0x79, 0x9e, 0xbf, 0x75, 0x01, 0x24,
0x49, 0x42, 0xb1, 0x54, 0x98, 0xfa, 0x47, 0xa4,
0x45, 0x17, 0x40, 0x51, 0x94, 0x4e, 0x8c, 0x56,
0xab, 0x39, 0x54, 0x6c, 0x47, 0x72, 0x01, 0x28,
0xa5, 0x28, 0x96, 0x0a, 0x9d, 0xb3, 0x2c, 0xcb,
0x9e, 0xe2, 0x48, 0x24, 0xd2, 0x3f, 0x03, 0xc6,
0x18, 0x64, 0x59, 0x76, 0x0d, 0xd2, 0xf9, 0x70,
0x50, 0xb9, 0x00, 0x94, 0x52, 0x94, 0xca, 0xc5,
0xa1, 0x0e, 0x7a, 0xa1, 0x9c, 0x2d, 0xb6, 0x2c,
0x06, 0x45, 0x19, 0xcd, 0x41, 0x30, 0x38, 0x8e,
0x76, 0xbb, 0xdd, 0x05, 0xe8, 0xba, 0x0e, 0xc6,
0x18, 0xc2, 0x61, 0x8a, 0xf2, 0x53, 0x69, 0xa8,
0x03, 0x4a, 0x25, 0x98, 0xa6, 0x81, 0xca, 0x4b,
0xa5, 0x0b, 0xd0, 0xb4, 0x1f, 0x04, 0x02, 0x63,
0xb0, 0x2c, 0x36, 0xd4, 0xee, 0xe5, 0xd5, 0x05,
0x1e, 0x1e, 0xef, 0xdd, 0x11, 0x04, 0x9e, 0xaf,
0x9e, 0x9d, 0x9f, 0xba, 0x16, 0x87, 0x31, 0xcb,
0xd3, 0xb6, 0x28, 0x8a, 0x58, 0x59, 0x5e, 0x85,
0x65, 0x99, 0x50, 0xbf, 0x54, 0xe4, 0xae, 0xb3,
0xe0, 0x36, 0xd6, 0xa3, 0x79, 0x00, 0x79, 0xc7,
0x72, 0x6c, 0x1b, 0x86, 0xe1, 0xeb, 0x15, 0x3b,
0x4b, 0x55, 0x55, 0xe4, 0x6e, 0xb2, 0x00, 0xf0,
0xec, 0xf3, 0x1a, 0x92, 0xa6, 0xe9, 0xf0, 0xfb,
0xfd, 0x10, 0x04, 0x01, 0xa2, 0x28, 0x82, 0x10,
0x82, 0x7a, 0xbd, 0x0e, 0x80, 0xe0, 0xe3, 0xf3,
0xdd, 0x16, 0xa7, 0x12, 0xb1, 0xe4, 0x1c, 0xe9,
0x15, 0x1f, 0x1e, 0xa7, 0xb3, 0xa6, 0x69, 0x2e,
0x79, 0x7d, 0xac, 0xbf, 0x2a, 0x00, 0x28, 0x24,
0x62, 0xc9, 0x1d, 0x00, 0xf8, 0x05, 0x42, 0x59,
0xa6, 0x03, 0x15, 0x88, 0xf7, 0xd8, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};
/* edit_copy.png - 1020 bytes */
static const unsigned char edit_copy_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x88, 0x00, 0x8a, 0x00, 0x85, 0x09,
0xa5, 0xa9, 0xd5, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x03,
0x87, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
0x57, 0xbb, 0x4e, 0xe3, 0x40, 0x14, 0xbd, 0x33,
0xb6, 0xf3, 0x70, 0x41, 0xba, 0x7c, 0x81, 0x13,
0xdb, 0xfc, 0x07, 0x42, 0x08, 0x1a, 0x2a, 0x24,
0x4a, 0x6a, 0x8a, 0x44, 0x40, 0x10, 0x88, 0x1a,
0x29, 0x84, 0x37, 0x12, 0x20, 0x14, 0x89, 0x9a,
0x86, 0x96, 0x0a, 0x09, 0x45, 0x10, 0x84, 0x40,
0x3c, 0x24, 0x20, 0xc1, 0xd4, 0x50, 0x00, 0x05,
0x89, 0x08, 0x8a, 0x3d, 0x7e, 0x6c, 0xe1, 0x9d,
0xb5, 0xd7, 0x8e, 0x93, 0x40, 0x82, 0xb4, 0x3b,
0x95, 0x67, 0x3c, 0x73, 0xee, 0x39, 0xf7, 0xdc,
0x19, 0x8f, 0x01, 0xfe, 0xf3, 0x86, 0xe8, 0xc3,
0xd2, 0xd2, 0xea, 0x6a, 0x2e, 0x37, 0x32, 0x62,
0x59, 0xa6, 0x69, 0x9a, 0x92, 0xf4, 0xe3, 0x81,
0x11, 0xc6, 0x18, 0x97, 0xcb, 0x13, 0x13, 0xa9,
0xd4, 0xd4, 0xd4, 0xde, 0xde, 0x77, 0x71, 0x58,
0xfa, 0x40, 0x88, 0xa6, 0x69, 0x9a, 0x28, 0x4e,
0x4f, 0x4f, 0x4d, 0xcd, 0xce, 0xfe, 0x7c, 0xe6,
0xd6, 0xd6, 0xd6, 0xd7, 0x97, 0x97, 0x45, 0xb1,
0x53, 0x9c, 0x3f, 0x02, 0x30, 0xc6, 0x18, 0x21,
0xe7, 0x45, 0xa5, 0x52, 0xa9, 0xbc, 0xbf, 0x77,
0x9f, 0x78, 0x4f, 0x4f, 0x4f, 0x4f, 0x2c, 0x06,
0x80, 0x10, 0x42, 0xee, 0x78, 0x1d, 0x0b, 0xf8,
0x6e, 0xb3, 0x2c, 0xcb, 0xb2, 0x2c, 0x84, 0x34,
0x4d, 0xd3, 0x34, 0x8d, 0x61, 0x9a, 0xcf, 0x03,
0x08, 0x85, 0x42, 0xa1, 0x70, 0x98, 0xf6, 0x2d,
0xeb, 0xc7, 0x05, 0x28, 0x8a, 0xa2, 0x3c, 0x3e,
0x06, 0x13, 0xbf, 0xbc, 0xbc, 0xbe, 0xbe, 0xb8,
0x18, 0x1d, 0xad, 0xd5, 0x6a, 0xb5, 0x8f, 0x0f,
0x41, 0xa0, 0x6f, 0x1b, 0x61, 0x21, 0x64, 0x67,
0xde, 0x2d, 0x68, 0x71, 0x71, 0x79, 0x39, 0x9b,
0x6d, 0xb7, 0x68, 0xd1, 0xef, 0x76, 0x70, 0x30,
0x31, 0x91, 0x4e, 0x67, 0x32, 0x43, 0x43, 0x2d,
0x05, 0x24, 0x93, 0xc9, 0x64, 0x22, 0xe1, 0x1f,
0x57, 0x55, 0x55, 0x55, 0x55, 0x86, 0x39, 0x3a,
0x2a, 0x14, 0x0e, 0x0f, 0x05, 0x21, 0x93, 0x99,
0x9c, 0x9c, 0x99, 0x41, 0x88, 0x0a, 0xeb, 0x34,
0xb3, 0x8d, 0xa9, 0x03, 0x2c, 0x2d, 0xad, 0xac,
0x2c, 0x2c, 0x0c, 0x0c, 0x74, 0xec, 0x00, 0x21,
0xba, 0x4e, 0x88, 0xe3, 0x07, 0x0d, 0x53, 0xad,
0x56, 0xab, 0x95, 0x4a, 0xb7, 0xe9, 0x3b, 0x7b,
0xe7, 0xef, 0x78, 0x6d, 0x08, 0x08, 0x72, 0xa0,
0x5e, 0xaf, 0xd7, 0xeb, 0x75, 0x80, 0x93, 0x93,
0x62, 0xb1, 0x50, 0xe8, 0x3e, 0x61, 0x87, 0x6a,
0xf3, 0x9d, 0xf2, 0x25, 0x07, 0xdc, 0x40, 0x84,
0x10, 0xa2, 0x69, 0xc1, 0x01, 0x4a, 0xa5, 0x52,
0xa9, 0x54, 0xea, 0x9c, 0xb8, 0x24, 0x49, 0x92,
0x2c, 0x77, 0x20, 0x20, 0x91, 0x48, 0x24, 0x04,
0xc1, 0x06, 0x74, 0xc0, 0xdd, 0x0e, 0x9c, 0x9e,
0x1e, 0x1f, 0xfb, 0xd7, 0x49, 0x92, 0x24, 0x7d,
0xe5, 0x73, 0xe8, 0x4d, 0x04, 0xed, 0x7f, 0xdb,
0x01, 0xba, 0x50, 0x51, 0x14, 0x45, 0x51, 0xfc,
0x02, 0x08, 0x21, 0x84, 0x90, 0xe0, 0x00, 0xe5,
0x72, 0xb9, 0x5c, 0x2e, 0xb7, 0x4f, 0xbc, 0x11,
0x8a, 0x65, 0x01, 0xc8, 0xb2, 0x2c, 0xf7, 0xf6,
0xb6, 0x21, 0xc0, 0x0b, 0x40, 0x81, 0x05, 0x41,
0x10, 0x1a, 0x3b, 0xa0, 0xaa, 0xaa, 0x0a, 0x70,
0x7a, 0x7a, 0x76, 0x76, 0x72, 0xe2, 0x07, 0x96,
0x65, 0x59, 0x6e, 0x64, 0x7d, 0xb3, 0x4c, 0xbb,
0xf1, 0xe9, 0xa9, 0xd3, 0x15, 0x07, 0xdc, 0x7b,
0x80, 0x8e, 0x13, 0x42, 0x88, 0xae, 0xb7, 0x76,
0x20, 0x88, 0x70, 0x50, 0xe2, 0x64, 0x59, 0x96,
0x25, 0xc9, 0x19, 0x0f, 0x87, 0xc3, 0xe1, 0x70,
0xf8, 0x0b, 0x02, 0x4c, 0xd3, 0x34, 0x4d, 0xd3,
0xef, 0x80, 0x5b, 0x00, 0x80, 0xfd, 0x1d, 0xa8,
0xd7, 0x01, 0xce, 0xce, 0xce, 0xcf, 0x8b, 0x45,
0x3f, 0xb0, 0x28, 0x8a, 0xa2, 0x28, 0xfa, 0x33,
0xdb, 0xca, 0x01, 0x84, 0x10, 0xc2, 0x18, 0x80,
0x65, 0x59, 0x96, 0x61, 0x9c, 0x52, 0xa5, 0xbc,
0x5a, 0x0a, 0x30, 0x0c, 0xc3, 0x30, 0x8c, 0x60,
0x6b, 0x69, 0x3f, 0x28, 0xf3, 0x74, 0xfc, 0xfe,
0xfe, 0xfe, 0xde, 0x7b, 0x0a, 0x35, 0xc3, 0xe3,
0x79, 0x9e, 0xe7, 0x79, 0x80, 0x58, 0x2c, 0x16,
0x73, 0xce, 0x7b, 0x80, 0x78, 0x3c, 0x1e, 0x8f,
0xc7, 0xfd, 0xbc, 0xda, 0x12, 0xe0, 0x25, 0xea,
0xcd, 0x54, 0xa3, 0xef, 0x2d, 0x9d, 0x2f, 0x8a,
0xa2, 0x98, 0x4c, 0x06, 0x13, 0xa6, 0x7d, 0x8c,
0x31, 0x66, 0x18, 0x00, 0x86, 0x61, 0x18, 0x86,
0x71, 0x32, 0x8d, 0x31, 0xc6, 0x18, 0xfb, 0x2b,
0x23, 0xd0, 0x01, 0x77, 0x6d, 0x13, 0x02, 0x10,
0x8d, 0x46, 0xa3, 0xd1, 0xa8, 0xbf, 0xa4, 0x28,
0x71, 0x8e, 0xe3, 0x38, 0x8e, 0x0b, 0x16, 0x60,
0x8b, 0xb4, 0xe7, 0x37, 0x3a, 0x65, 0xe8, 0x7a,
0x5a, 0x32, 0x74, 0x1d, 0xcb, 0xb2, 0x2c, 0xcb,
0xfa, 0x37, 0x71, 0xb1, 0x68, 0x1f, 0xd7, 0x5e,
0x21, 0xac, 0x03, 0x18, 0x0a, 0x85, 0x42, 0x0f,
0x0f, 0x9b, 0x9b, 0xdb, 0xdb, 0x1b, 0x1b, 0xed,
0x9f, 0xe0, 0x34, 0x90, 0x57, 0x68, 0x50, 0xe6,
0x69, 0x66, 0x29, 0x71, 0xba, 0x6e, 0x67, 0x27,
0x9f, 0xdf, 0xda, 0x6a, 0x37, 0xea, 0xf5, 0xb5,
0x4f, 0xc0, 0x77, 0xff, 0x8c, 0xb2, 0xd9, 0x5c,
0x6e, 0x7e, 0x7e, 0x66, 0xa6, 0xd5, 0xde, 0xf1,
0x96, 0x0a, 0x9d, 0xe7, 0x94, 0x8e, 0x3d, 0x6f,
0x60, 0xa0, 0xaf, 0x6f, 0x70, 0xd0, 0xc1, 0x7f,
0x7d, 0x7d, 0x7b, 0x7b, 0x79, 0x01, 0xb8, 0xbc,
0xbc, 0xba, 0xba, 0xb8, 0x00, 0xb0, 0x2f, 0x8a,
0xdb, 0xdb, 0x3e, 0x01, 0x9d, 0xb6, 0xa0, 0xbd,
0xc3, 0x71, 0x1c, 0xc7, 0xb2, 0x36, 0x51, 0xd6,
0x15, 0xcd, 0xed, 0x04, 0x42, 0x8e, 0x10, 0xda,
0x9e, 0x9e, 0x9e, 0x9f, 0x9f, 0x9e, 0x00, 0x6e,
0x6f, 0xef, 0xee, 0x6e, 0x6e, 0x00, 0x22, 0x11,
0x9e, 0xe7, 0xf9, 0x8d, 0x8d, 0x54, 0x6a, 0x7c,
0x3c, 0x9d, 0xce, 0xe7, 0xbb, 0x2e, 0x80, 0xee,
0x9d, 0x48, 0x24, 0x12, 0x89, 0x44, 0x82, 0xaf,
0x02, 0x94, 0xa8, 0xd7, 0x09, 0xc3, 0x30, 0x0c,
0xd3, 0x74, 0x32, 0x4e, 0x89, 0x03, 0x60, 0x8c,
0xd0, 0xd8, 0x98, 0x4d, 0x7c, 0x77, 0xd7, 0x1b,
0xb7, 0xe3, 0x7b, 0xbb, 0x7d, 0x3f, 0xdf, 0xdf,
0xd7, 0x75, 0x5d, 0xd7, 0xf5, 0xe1, 0x61, 0x3a,
0xde, 0xee, 0xff, 0x96, 0x2d, 0x92, 0x5e, 0x14,
0x4d, 0xd3, 0x76, 0xa5, 0x58, 0xb4, 0x4b, 0xaa,
0xbf, 0x7f, 0x76, 0x36, 0x93, 0x99, 0x9b, 0xfb,
0xfc, 0xec, 0x56, 0xa2, 0xff, 0xb9, 0xf6, 0x0b,
0xd9, 0xe5, 0x3d, 0x1c, 0x7d, 0xfc, 0xfa, 0x4e,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xae, 0x42, 0x60, 0x82};

333
art/tango/edit_cut.h Normal file
View File

@@ -0,0 +1,333 @@
/* edit_cut.png - 807 bytes */
static const unsigned char edit_cut_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0a, 0x1c, 0x16, 0x1d, 0x31, 0x68,
0x41, 0x64, 0x5e, 0x00, 0x00, 0x02, 0xb4, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x85, 0x93, 0x5d,
0x48, 0x93, 0x51, 0x18, 0xc7, 0x9f, 0x73, 0xde,
0x77, 0xaf, 0xaf, 0xdb, 0xd4, 0x7d, 0xa5, 0xdb,
0x6c, 0xf8, 0x15, 0x68, 0x78, 0xd1, 0x55, 0x10,
0x74, 0x61, 0x94, 0x49, 0x57, 0x45, 0xde, 0x64,
0x22, 0x11, 0x68, 0x69, 0x96, 0x58, 0xa8, 0x69,
0x81, 0x90, 0x04, 0x95, 0xa5, 0x7d, 0x81, 0x88,
0x10, 0x94, 0x18, 0xe8, 0x10, 0xf4, 0x4a, 0x90,
0x24, 0xba, 0x0c, 0x02, 0xb5, 0x30, 0x6d, 0x33,
0x36, 0xf2, 0x63, 0xef, 0x36, 0x75, 0x9b, 0xee,
0x75, 0x5f, 0xef, 0x76, 0xce, 0xdb, 0x4d, 0xce,
0x61, 0x5a, 0xe7, 0xee, 0xfc, 0xff, 0x0f, 0x3f,
0xfe, 0xcf, 0xf3, 0x9c, 0x83, 0x20, 0xe5, 0x3c,
0xeb, 0x7d, 0x72, 0x0e, 0x00, 0xde, 0xf3, 0x3c,
0xef, 0x6d, 0xba, 0x79, 0xbb, 0x74, 0x8f, 0xd7,
0xcf, 0xb2, 0xec, 0xa5, 0x3b, 0xcd, 0xad, 0xba,
0x54, 0x1d, 0xa7, 0x5e, 0x18, 0x86, 0x19, 0xbb,
0xd5, 0xd8, 0xac, 0x8d, 0x46, 0xa3, 0xcb, 0x7d,
0xfd, 0xaf, 0x3b, 0x53, 0x3d, 0x05, 0xab, 0xb8,
0x70, 0xe6, 0x74, 0xb9, 0xe6, 0xc5, 0xab, 0x9e,
0x4f, 0x07, 0x02, 0x08, 0x21, 0xfc, 0x4f, 0x87,
0x1d, 0xd7, 0xd5, 0xd6, 0x57, 0x10, 0x42, 0x8e,
0xed, 0xe8, 0x4f, 0x7b, 0x1e, 0x97, 0x99, 0x73,
0xcd, 0xa6, 0xed, 0x90, 0x88, 0x28, 0xa5, 0x27,
0x0e, 0x04, 0x60, 0x8c, 0x43, 0x4b, 0x4b, 0xbf,
0x80, 0x4f, 0x4b, 0x43, 0xb1, 0x58, 0xac, 0x74,
0x27, 0x05, 0xcb, 0xb2, 0x53, 0x85, 0x85, 0x85,
0xe0, 0x71, 0x7b, 0x28, 0xa5, 0xd4, 0xf1, 0xaf,
0x04, 0x15, 0x36, 0x9b, 0x0d, 0x56, 0x5d, 0x2b,
0xa8, 0xae, 0xb6, 0xbe, 0x38, 0x91, 0x48, 0x9c,
0xea, 0x79, 0xde, 0x3d, 0x50, 0x52, 0x52, 0xa2,
0x40, 0x80, 0xc1, 0xe1, 0x74, 0x00, 0x00, 0x58,
0x0f, 0x04, 0xdc, 0x6d, 0xbd, 0xf7, 0x19, 0x63,
0xbc, 0xbc, 0xb8, 0x68, 0x07, 0x3e, 0x8d, 0x47,
0x92, 0x24, 0x1d, 0xd7, 0xeb, 0xf4, 0xd7, 0x64,
0x0a, 0xb0, 0xbe, 0xb1, 0x46, 0x01, 0x60, 0xa2,
0xad, 0xa5, 0xe3, 0xe1, 0x81, 0x00, 0x00, 0x00,
0x4a, 0x69, 0xe5, 0xc2, 0x8f, 0x05, 0x79, 0x6d,
0xcd, 0x03, 0x8d, 0x37, 0x9a, 0x54, 0xf1, 0x44,
0x1c, 0x89, 0x62, 0x10, 0xe6, 0xe6, 0xe6, 0x24,
0x00, 0xe8, 0xda, 0x5b, 0xff, 0x17, 0xa0, 0xad,
0xa5, 0x63, 0x1a, 0x63, 0x3c, 0x64, 0x5f, 0xb4,
0xd1, 0x60, 0x70, 0x0b, 0x6b, 0x34, 0x1a, 0x10,
0xdc, 0x82, 0x2c, 0xcb, 0xf2, 0xbb, 0xb6, 0x96,
0x8e, 0xe9, 0xff, 0x02, 0xfe, 0xa4, 0x98, 0x9a,
0x9d, 0x99, 0xc6, 0x4e, 0xa7, 0x03, 0xd2, 0x39,
0x1e, 0x32, 0xdf, 0x0e, 0x46, 0x10, 0x42, 0x6f,
0xf6, 0xab, 0x45, 0x7b, 0x85, 0x31, 0xa3, 0xb1,
0x97, 0x50, 0x7a, 0x3d, 0xbe, 0xb9, 0xa9, 0x26,
0xe5, 0x65, 0x32, 0x33, 0xf9, 0x11, 0x15, 0x18,
0x73, 0x40, 0x20, 0x74, 0x0b, 0x21, 0x34, 0x50,
0xe9, 0xf1, 0xb4, 0xef, 0x0b, 0x18, 0x33, 0x99,
0x3a, 0xe3, 0x7e, 0xff, 0x83, 0xa3, 0x26, 0x13,
0x24, 0x28, 0x45, 0xde, 0xad, 0x4d, 0xd9, 0x17,
0xde, 0x1e, 0x66, 0x65, 0x54, 0x55, 0x90, 0x9d,
0xc3, 0xf0, 0x1c, 0x47, 0x25, 0x59, 0x06, 0xe7,
0xfa, 0x3a, 0x28, 0xb2, 0xb2, 0xae, 0x56, 0xba,
0xdd, 0x43, 0xc9, 0x16, 0xc6, 0xcd, 0xe6, 0x1a,
0xc9, 0xe7, 0xeb, 0x2a, 0x36, 0x1a, 0xe9, 0xc2,
0xca, 0xca, 0x54, 0x30, 0x12, 0x96, 0x02, 0x41,
0x11, 0xd7, 0xc4, 0x69, 0x4d, 0x94, 0x23, 0x3a,
0x96, 0xc1, 0x34, 0x10, 0x12, 0x13, 0x8e, 0xd5,
0xd5, 0x0f, 0x47, 0xf4, 0x7a, 0x12, 0xf3, 0xf9,
0x06, 0xc7, 0xcd, 0xe6, 0xdd, 0x97, 0x3a, 0x6a,
0x30, 0x08, 0xf3, 0x45, 0x45, 0x64, 0x84, 0x61,
0xee, 0x03, 0x00, 0xcc, 0x58, 0x2c, 0x21, 0xab,
0x52, 0x99, 0xd8, 0xf1, 0x47, 0x18, 0x86, 0x7c,
0xc9, 0x35, 0x07, 0x01, 0x00, 0x86, 0x31, 0x6e,
0xff, 0x96, 0x9f, 0x4f, 0x46, 0x0d, 0x06, 0x61,
0x77, 0x88, 0xb1, 0x98, 0x5e, 0x92, 0x24, 0x52,
0x45, 0xc8, 0xa3, 0x09, 0x95, 0xea, 0xa5, 0x82,
0x65, 0x79, 0x84, 0xb1, 0x3d, 0x39, 0x69, 0x8e,
0x9b, 0x51, 0xf3, 0xe9, 0xaa, 0xc9, 0x8c, 0x8c,
0xbe, 0xcb, 0x94, 0x76, 0x83, 0x2c, 0x53, 0x20,
0xc4, 0xb0, 0x0b, 0xe0, 0x38, 0x41, 0xad, 0x54,
0x32, 0x5f, 0xf3, 0xf2, 0x62, 0x26, 0x9d, 0xae,
0x69, 0x5e, 0x10, 0xbc, 0x8a, 0xcc, 0xcc, 0x2b,
0xc9, 0x8f, 0xa4, 0xd5, 0x36, 0x7c, 0x77, 0xb9,
0x36, 0x0e, 0x1f, 0x3a, 0xd4, 0x30, 0x6b, 0xb1,
0xc4, 0x08, 0xa5, 0x18, 0x30, 0x0e, 0x00, 0x00,
0x30, 0x00, 0x00, 0xd5, 0x5a, 0xad, 0xcf, 0xe5,
0xf7, 0x9f, 0xf4, 0x4b, 0x12, 0x1b, 0x00, 0x90,
0x39, 0xb5, 0xfa, 0xec, 0x45, 0x41, 0x48, 0xee,
0xdc, 0x2a, 0x8a, 0xee, 0xea, 0xec, 0x6c, 0x8f,
0x37, 0x10, 0xc8, 0xf1, 0x87, 0xc3, 0x1a, 0x5f,
0x24, 0xe2, 0x53, 0xa8, 0x54, 0xe7, 0xad, 0xa2,
0xe8, 0xfe, 0x0d, 0xa0, 0xf3, 0x3a, 0x07, 0xdc,
0x34, 0xc1, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
/* edit_cut.png - 1800 bytes */
static const unsigned char edit_cut_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x1c, 0x20, 0x00,
0x00, 0x1c, 0x20, 0x01, 0xcd, 0x0f, 0x9b, 0x9e,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
0x93, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xdd,
0x56, 0x5b, 0x48, 0x54, 0x5b, 0x18, 0xfe, 0xd7,
0xde, 0x6b, 0xcf, 0xac, 0x49, 0xad, 0xd4, 0x99,
0xcc, 0x66, 0x1c, 0x27, 0xe8, 0x32, 0x51, 0x99,
0x15, 0x35, 0x26, 0x1a, 0x95, 0x16, 0x15, 0x3d,
0x44, 0x20, 0x45, 0x44, 0xbd, 0x04, 0x49, 0x76,
0x91, 0x1e, 0x2a, 0x28, 0x0a, 0x83, 0xa0, 0x1b,
0x64, 0x44, 0x10, 0x15, 0x3d, 0x44, 0x84, 0x97,
0x30, 0x33, 0xa2, 0xc2, 0x92, 0xec, 0x82, 0xd9,
0x43, 0x16, 0xd9, 0x4d, 0x4a, 0xcc, 0xb4, 0xa9,
0xa6, 0xd1, 0xc6, 0xb9, 0xed, 0xd9, 0xb7, 0x75,
0x1e, 0x56, 0xeb, 0x98, 0x9e, 0xe3, 0xc9, 0xcc,
0xf3, 0x70, 0xce, 0xff, 0xb2, 0x58, 0x7b, 0xad,
0xff, 0xfb, 0xff, 0xef, 0xfb, 0xff, 0xb5, 0xd7,
0x02, 0xf8, 0x8f, 0x1b, 0x1a, 0xec, 0xc6, 0xe3,
0xc7, 0x4f, 0x9c, 0x38, 0x76, 0xac, 0xa1, 0xc1,
0x30, 0x0c, 0xc3, 0x30, 0xb2, 0xb2, 0x54, 0x55,
0x55, 0x55, 0x35, 0x37, 0x77, 0xf7, 0xee, 0x9d,
0x3b, 0xf7, 0xec, 0x79, 0xf0, 0xe0, 0x57, 0x03,
0x1f, 0x3a, 0x74, 0xe4, 0xc8, 0xc1, 0x83, 0xc5,
0xc5, 0x1c, 0x9d, 0x10, 0x42, 0x2c, 0x96, 0xce,
0xce, 0xe2, 0xe2, 0x6d, 0xdb, 0x76, 0xec, 0x70,
0x38, 0x06, 0x8b, 0x23, 0x0c, 0x36, 0x90, 0x20,
0x08, 0x82, 0x20, 0x78, 0x3c, 0x73, 0xe6, 0xcc,
0x99, 0xe3, 0xf1, 0x00, 0x58, 0xad, 0xc9, 0xc9,
0x56, 0x6b, 0x6d, 0xed, 0x50, 0x95, 0x23, 0x84,
0x10, 0x42, 0x8e, 0x1e, 0x5d, 0xbe, 0x7c, 0xd9,
0xb2, 0x15, 0x2b, 0x00, 0x18, 0xbe, 0xdd, 0xce,
0xe2, 0x5d, 0xb9, 0x32, 0x6c, 0x04, 0xe2, 0xe2,
0xe2, 0xe2, 0xe2, 0xe2, 0x36, 0x6f, 0x5e, 0xb2,
0x64, 0xf1, 0xe2, 0xa5, 0x4b, 0x11, 0x72, 0xb9,
0x9c, 0xce, 0xf1, 0xe3, 0x01, 0x44, 0x51, 0x10,
0x44, 0x91, 0x90, 0xb3, 0x67, 0xcf, 0x9d, 0x3b,
0x7d, 0xba, 0xa4, 0x64, 0xb0, 0x01, 0x4f, 0x9e,
0x3c, 0x75, 0xaa, 0xb4, 0xb4, 0xac, 0xcc, 0x6e,
0x1f, 0x37, 0xce, 0x6e, 0xc7, 0x38, 0x31, 0x71,
0xf4, 0xe8, 0xa4, 0x24, 0x80, 0xf9, 0xf3, 0x73,
0x73, 0x17, 0x2c, 0x00, 0x18, 0x3b, 0x36, 0x25,
0x65, 0xec, 0xd8, 0xe9, 0xd3, 0x87, 0x8d, 0x80,
0xa6, 0x69, 0x9a, 0xa6, 0xd9, 0xed, 0x56, 0x6b,
0x72, 0xb2, 0xcd, 0xd6, 0xfb, 0x3d, 0x37, 0x77,
0xfe, 0xfc, 0x05, 0x0b, 0xf8, 0x6c, 0xcf, 0x9e,
0x9f, 0xe1, 0x30, 0x65, 0xd3, 0xd3, 0x63, 0xb1,
0x58, 0x2c, 0x16, 0x5b, 0xbd, 0x3a, 0x2b, 0xcb,
0xe3, 0xc9, 0xce, 0x06, 0xd0, 0x75, 0x5d, 0xd7,
0x75, 0x5e, 0x11, 0x80, 0x70, 0x38, 0x12, 0x09,
0x87, 0xd3, 0xd2, 0x86, 0x8d, 0x00, 0x0b, 0xd8,
0xd2, 0x52, 0x53, 0x73, 0xed, 0xda, 0x95, 0x2b,
0x86, 0x61, 0x32, 0x99, 0x4c, 0x26, 0x13, 0x80,
0x24, 0x61, 0x2c, 0x49, 0x00, 0x29, 0x29, 0x29,
0x29, 0xa9, 0xa9, 0xa2, 0x78, 0xf1, 0xe2, 0xa5,
0x4b, 0x17, 0x2e, 0xd4, 0xd5, 0x0d, 0x84, 0x93,
0x90, 0x90, 0x90, 0x90, 0x90, 0x50, 0x5d, 0x3d,
0x6f, 0x5e, 0x56, 0x56, 0x76, 0x36, 0x13, 0x46,
0xd7, 0x79, 0xeb, 0x00, 0xdc, 0xbd, 0x5b, 0x5f,
0x7f, 0xe7, 0x0e, 0x40, 0x30, 0x18, 0x0c, 0x06,
0x83, 0xbb, 0x76, 0x0d, 0x1b, 0x01, 0x66, 0x2b,
0x57, 0xfa, 0x7c, 0x5f, 0xbf, 0xfa, 0x7c, 0x08,
0xc9, 0xb2, 0x2c, 0x47, 0xa3, 0x00, 0x94, 0x52,
0x4a, 0x29, 0x40, 0x46, 0xc6, 0xf4, 0xe9, 0x33,
0x66, 0x00, 0x84, 0x42, 0xa1, 0x50, 0x30, 0xb8,
0x70, 0xe1, 0xdf, 0x2b, 0x9f, 0x93, 0xc3, 0x94,
0xce, 0xcc, 0x74, 0x38, 0xec, 0x76, 0xa7, 0xb3,
0xd7, 0xff, 0xf3, 0xe7, 0x2f, 0x5f, 0x3e, 0x7f,
0x66, 0x42, 0x29, 0xca, 0xb7, 0x6f, 0xec, 0xa7,
0x50, 0x5a, 0x3a, 0x6c, 0x04, 0x18, 0xe0, 0xfb,
0xf7, 0x6c, 0x76, 0xfe, 0x7c, 0x75, 0x75, 0x4d,
0x4d, 0x55, 0x15, 0xa5, 0xec, 0x6c, 0xf4, 0x26,
0x32, 0x73, 0xe6, 0x8c, 0x19, 0xb3, 0x67, 0x03,
0x54, 0x54, 0x54, 0x56, 0x96, 0x95, 0xbd, 0x79,
0xc3, 0xfd, 0xe3, 0xe3, 0xe3, 0xe3, 0xe3, 0xe3,
0xaf, 0x5f, 0x5f, 0xb4, 0x68, 0xe1, 0xc2, 0xfc,
0x7c, 0xde, 0x92, 0x00, 0x18, 0x63, 0x8c, 0x31,
0x40, 0x7d, 0xfd, 0xbd, 0x7b, 0x75, 0x75, 0x00,
0xd1, 0x68, 0x34, 0x1a, 0x89, 0x64, 0x66, 0x0e,
0x36, 0xf1, 0x5f, 0xac, 0x00, 0x27, 0xb2, 0x71,
0xa3, 0x2c, 0xcb, 0xb2, 0x2c, 0x07, 0x02, 0xaf,
0x5e, 0xbd, 0x7e, 0xfd, 0xe2, 0x05, 0xa5, 0x08,
0x21, 0x84, 0x10, 0x80, 0xd5, 0x6a, 0xb5, 0xda,
0x6c, 0xac, 0x05, 0x7a, 0x7a, 0x26, 0x4d, 0x3a,
0x77, 0xee, 0xfc, 0xf9, 0x33, 0x67, 0x4a, 0x4b,
0x47, 0x8f, 0x1e, 0x35, 0x2a, 0x31, 0x71, 0xe4,
0x48, 0x42, 0xcc, 0x66, 0x8b, 0xa5, 0x97, 0x70,
0x53, 0xd3, 0xd3, 0xa7, 0x4f, 0x9e, 0x00, 0x98,
0xcd, 0x66, 0xb3, 0xd9, 0x5c, 0x5e, 0xde, 0x57,
0xa8, 0x7f, 0x81, 0x40, 0x5f, 0x2b, 0x2c, 0x7c,
0xf4, 0xa8, 0xb1, 0xb1, 0xa1, 0x01, 0xa1, 0x11,
0x23, 0x46, 0x8c, 0xf8, 0x31, 0xb1, 0x79, 0xf3,
0xb2, 0xb2, 0x72, 0x72, 0x78, 0xcf, 0x6f, 0xdf,
0x9e, 0x96, 0xe6, 0x74, 0xa6, 0xa7, 0xf7, 0xae,
0x0b, 0x82, 0x20, 0x20, 0x04, 0xd0, 0xd1, 0xd1,
0xd9, 0xd9, 0xde, 0xae, 0x28, 0x5b, 0xb7, 0x16,
0x15, 0x15, 0x17, 0xaf, 0x59, 0x33, 0xb4, 0x3c,
0x86, 0x40, 0x80, 0x29, 0x55, 0x5e, 0xce, 0x2e,
0xb4, 0xfa, 0xfa, 0xfb, 0xf7, 0x1f, 0x3c, 0xb8,
0x77, 0xcf, 0x30, 0x44, 0x51, 0x14, 0x45, 0x11,
0x40, 0x92, 0x24, 0x49, 0x92, 0x98, 0xb2, 0x84,
0x00, 0xe8, 0x3a, 0x6b, 0x19, 0x5e, 0xa9, 0x5b,
0xb7, 0x6a, 0x6b, 0x6f, 0xde, 0xe4, 0x87, 0x35,
0x2f, 0x6f, 0xa8, 0x89, 0xff, 0x66, 0x05, 0xb8,
0x6d, 0xd8, 0xf0, 0xee, 0x5d, 0x6b, 0xeb, 0xdb,
0xb7, 0x94, 0x02, 0x20, 0x44, 0x69, 0xaf, 0xd2,
0x6e, 0xf7, 0xa4, 0x49, 0x53, 0xa6, 0x00, 0x84,
0xc3, 0xe1, 0x70, 0x28, 0x04, 0xd0, 0xda, 0xda,
0xd6, 0xd6, 0xda, 0x0a, 0x80, 0xb1, 0x28, 0x8a,
0xe2, 0xcb, 0x97, 0x43, 0xbd, 0xc1, 0xfb, 0x9b,
0x38, 0x54, 0xc7, 0xdb, 0xb7, 0x6b, 0x6b, 0xeb,
0xea, 0x02, 0x81, 0xbc, 0xbc, 0xfc, 0xfc, 0x45,
0x8b, 0x2c, 0x96, 0x4f, 0x9f, 0x5a, 0x5a, 0x5a,
0x5a, 0x72, 0x72, 0xdc, 0xee, 0x8c, 0x8c, 0xcc,
0x4c, 0x00, 0xf6, 0xd4, 0x00, 0x50, 0x14, 0x45,
0x51, 0x14, 0x00, 0xbf, 0xff, 0xd5, 0xab, 0x97,
0x2f, 0x01, 0xd6, 0xaf, 0x2f, 0x2c, 0x2c, 0x2a,
0x1a, 0x33, 0xe6, 0x77, 0x13, 0x1f, 0xa6, 0x0a,
0x00, 0xb8, 0xdd, 0x7b, 0xf7, 0x96, 0x94, 0x28,
0x4a, 0x2c, 0xd6, 0xd6, 0xd6, 0xd6, 0x06, 0xd0,
0xdc, 0xfc, 0xec, 0x59, 0x53, 0x13, 0x80, 0xdb,
0xed, 0x76, 0xbb, 0xdd, 0x08, 0x45, 0xa3, 0xc1,
0x60, 0x30, 0x08, 0xe0, 0xf3, 0xb5, 0xb4, 0xbc,
0x79, 0x03, 0x50, 0x5d, 0x6d, 0x32, 0x99, 0x4c,
0x83, 0xbf, 0xb9, 0x7f, 0x66, 0x83, 0x7e, 0xcc,
0x5d, 0xbc, 0x08, 0x00, 0xe0, 0x72, 0x8d, 0x1a,
0x45, 0x08, 0x21, 0x25, 0x25, 0x82, 0x80, 0x10,
0x42, 0x05, 0x05, 0xb1, 0x98, 0xa6, 0x69, 0x1a,
0x21, 0xd3, 0xa6, 0x4d, 0x9b, 0x36, 0x75, 0x2a,
0x42, 0x7e, 0xbf, 0xc5, 0x62, 0xb1, 0x00, 0x7c,
0xf8, 0xd0, 0xd8, 0xf8, 0xf8, 0x31, 0x40, 0x5a,
0x9a, 0xc7, 0x33, 0x77, 0x2e, 0x40, 0x72, 0x72,
0x34, 0x1a, 0x8d, 0x02, 0x34, 0x37, 0x37, 0x37,
0xbf, 0x78, 0x41, 0xa9, 0xd9, 0x8c, 0x31, 0xc6,
0xb2, 0x6c, 0x18, 0x94, 0x52, 0x5a, 0x59, 0x19,
0x08, 0xc8, 0xb2, 0x2c, 0xef, 0xdf, 0xbf, 0x6e,
0x1d, 0x00, 0x40, 0x5b, 0xdb, 0xb0, 0x11, 0x60,
0x8a, 0x15, 0x16, 0x4a, 0x92, 0x28, 0x8a, 0xe2,
0xbe, 0x7d, 0xe9, 0xe9, 0x89, 0x89, 0x89, 0x89,
0xa9, 0xa9, 0x84, 0xb0, 0xc3, 0x2a, 0x49, 0xec,
0x26, 0xe5, 0xd6, 0xd8, 0xd8, 0xde, 0xde, 0xde,
0x4e, 0xe9, 0x77, 0xf8, 0xef, 0xf8, 0x94, 0x7a,
0x3c, 0x4e, 0xa7, 0xd3, 0x89, 0xfe, 0x8c, 0xa7,
0xaa, 0x86, 0x61, 0x18, 0x00, 0xb2, 0xcc, 0x5a,
0xed, 0xfd, 0xfb, 0xee, 0xee, 0xee, 0x6e, 0xaf,
0x57, 0x55, 0x75, 0x5d, 0xd7, 0x0f, 0x1c, 0x58,
0xb9, 0x52, 0x51, 0x14, 0xe5, 0xf4, 0xe9, 0x9f,
0xe5, 0x37, 0x60, 0x0b, 0x55, 0x55, 0x39, 0x1c,
0x76, 0x7b, 0x7e, 0xbe, 0xae, 0x53, 0x4a, 0xe9,
0xae, 0x5d, 0x93, 0x27, 0xdb, 0x6c, 0x36, 0x5b,
0x6a, 0xea, 0xb7, 0x6f, 0xd1, 0x68, 0x34, 0xea,
0xf7, 0x37, 0x37, 0x7b, 0xbd, 0x5e, 0x6f, 0x77,
0xb7, 0xdf, 0x1f, 0x89, 0x44, 0x22, 0x00, 0x5f,
0xbe, 0x84, 0x42, 0xa1, 0x10, 0x80, 0xa2, 0xe8,
0xba, 0xae, 0x1f, 0x3e, 0x8c, 0x71, 0x41, 0xc1,
0xaa, 0x55, 0x67, 0xce, 0xf0, 0x39, 0x5f, 0xe7,
0xfb, 0xb9, 0x3f, 0xc7, 0xe3, 0xf8, 0x3c, 0x1e,
0x8f, 0x3f, 0x64, 0x02, 0x00, 0x91, 0x48, 0x24,
0xb2, 0x71, 0x63, 0x76, 0xb6, 0xcb, 0xe5, 0x72,
0xb9, 0x5c, 0x7e, 0x7f, 0x38, 0x1c, 0x0e, 0xf3,
0x44, 0x2b, 0x2a, 0x58, 0x62, 0xa7, 0x4e, 0x59,
0x2c, 0xac, 0x12, 0x1f, 0x3f, 0xf6, 0xf4, 0xf4,
0xf4, 0x00, 0x18, 0x06, 0x00, 0xc0, 0xd3, 0xa7,
0xab, 0x56, 0x95, 0x95, 0x55, 0x56, 0x6e, 0xda,
0xc4, 0xb0, 0x9a, 0x9a, 0xf8, 0x3a, 0xdf, 0xcf,
0xfd, 0x39, 0x1e, 0xc7, 0xe7, 0xf1, 0x78, 0xfc,
0xdf, 0x20, 0xa0, 0xaa, 0xaa, 0x3a, 0x61, 0x02,
0x21, 0xec, 0xca, 0x0f, 0x87, 0x15, 0x45, 0x51,
0x34, 0xcd, 0xe7, 0xd3, 0x75, 0x5d, 0xaf, 0xa9,
0x61, 0x3d, 0xbc, 0x69, 0x53, 0x5c, 0x1c, 0x7b,
0xdc, 0xb1, 0x33, 0xd1, 0xd9, 0xb9, 0x7e, 0x3d,
0x00, 0xc0, 0xb5, 0x6b, 0x0c, 0x83, 0x10, 0xd6,
0xd3, 0x57, 0xaf, 0xf2, 0x75, 0xbe, 0x9f, 0xfb,
0x73, 0x3c, 0x8e, 0xcf, 0xe3, 0x51, 0xaa, 0x28,
0x8a, 0x32, 0x71, 0x62, 0xdf, 0x56, 0xfc, 0xab,
0xe1, 0x01, 0x78, 0x09, 0x08, 0xa9, 0xaa, 0xa6,
0x39, 0x1c, 0x3d, 0x3d, 0xb2, 0x2c, 0xcb, 0x00,
0x23, 0x47, 0xb2, 0xe7, 0x6e, 0x46, 0x06, 0xc6,
0x18, 0xdf, 0xb8, 0xe1, 0x70, 0x24, 0x25, 0x25,
0x25, 0x31, 0x6d, 0x3f, 0x7e, 0xf4, 0xf9, 0xda,
0xdb, 0x35, 0x4d, 0xd3, 0x2a, 0x2a, 0x98, 0xbf,
0xdd, 0xce, 0x7b, 0x9f, 0x23, 0xb2, 0xf5, 0xf2,
0x72, 0x00, 0xaf, 0xd7, 0xeb, 0x5d, 0xb7, 0x6e,
0xd6, 0x2c, 0x87, 0xc3, 0xe1, 0x18, 0x33, 0xa6,
0xa3, 0xa3, 0xab, 0xab, 0xab, 0xeb, 0xc6, 0x0d,
0x49, 0xc2, 0x18, 0x63, 0x4d, 0xe3, 0xf1, 0x04,
0x41, 0xd3, 0x74, 0x9d, 0xe3, 0x10, 0xc2, 0x45,
0x65, 0xa3, 0xae, 0x73, 0xfc, 0x7e, 0x15, 0xe0,
0x4c, 0x05, 0xc1, 0x64, 0xc2, 0x18, 0xe3, 0x0b,
0x17, 0x3a, 0x3a, 0x02, 0x81, 0x40, 0x00, 0x20,
0x3e, 0x5e, 0x92, 0x24, 0x09, 0x63, 0x8b, 0xc5,
0x6c, 0x36, 0x9b, 0x01, 0x9e, 0x3f, 0xf7, 0x7a,
0xbd, 0x5e, 0x80, 0xae, 0x2e, 0x4a, 0x29, 0x7d,
0xf8, 0x70, 0xcb, 0x16, 0x4d, 0xd3, 0xb4, 0xca,
0x4a, 0xe6, 0x9f, 0x94, 0xd4, 0x77, 0xb4, 0xd9,
0x8a, 0x8a, 0x34, 0x4d, 0xd3, 0x2e, 0x5f, 0xfe,
0xfa, 0x95, 0x52, 0x4a, 0x1b, 0x1a, 0xb8, 0x3f,
0xc7, 0xe3, 0xf8, 0x3c, 0x9e, 0x61, 0x60, 0x8c,
0x71, 0x59, 0x19, 0xf3, 0x37, 0x9b, 0xd9, 0x28,
0x8a, 0xfd, 0x2b, 0x32, 0x40, 0x69, 0xf8, 0x46,
0x8c, 0x2f, 0x5f, 0x26, 0x84, 0x90, 0x9d, 0x3b,
0x05, 0x81, 0x52, 0x4a, 0xf3, 0xf2, 0xd8, 0x6f,
0x0f, 0x21, 0xaf, 0x97, 0x52, 0x4a, 0x6f, 0xdf,
0xde, 0xba, 0x55, 0x55, 0x55, 0xb5, 0xaa, 0xaa,
0xaf, 0x1f, 0x3b, 0x09, 0x3f, 0x14, 0xba, 0x5f,
0xa5, 0x35, 0xed, 0xf8, 0x71, 0x8c, 0x31, 0x2e,
0x28, 0x18, 0x37, 0x4e, 0x10, 0x04, 0x21, 0x2f,
0x0f, 0x63, 0x84, 0x10, 0xd2, 0xf5, 0x58, 0x0c,
0x21, 0x84, 0xee, 0xde, 0x5d, 0xbb, 0x56, 0x96,
0x65, 0xf9, 0xd8, 0x31, 0xbe, 0x7f, 0xa0, 0x0a,
0xfc, 0xe4, 0x37, 0xca, 0x99, 0xf6, 0x56, 0xa6,
0xef, 0xc8, 0x13, 0x93, 0xa4, 0x7f, 0xee, 0x55,
0xbe, 0x9f, 0xaf, 0x73, 0x82, 0x3c, 0x31, 0x9e,
0x50, 0xff, 0x39, 0x37, 0xde, 0x8a, 0xfd, 0x85,
0xf9, 0x1f, 0xd8, 0x1f, 0x0f, 0x81, 0xaf, 0x1e,
0x56, 0x80, 0xb3, 0xac, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};

339
art/tango/edit_delete.h Normal file
View File

@@ -0,0 +1,339 @@
/* edit_delete.png - 680 bytes */
static const unsigned char edit_delete_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x8d, 0x00, 0x8e, 0x00, 0x8b, 0x21,
0xf4, 0xa3, 0x7e, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd6, 0x06, 0x13, 0x0f, 0x1d, 0x09, 0x48,
0xb3, 0xcb, 0xc6, 0x00, 0x00, 0x00, 0x0f, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
0x6e, 0x74, 0x00, 0x69, 0x64, 0x20, 0x6c, 0x6f,
0x67, 0x6f, 0x86, 0xc6, 0x77, 0xb9, 0x00, 0x00,
0x02, 0x1a, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb,
0xa5, 0x90, 0xbf, 0x4f, 0x13, 0x71, 0x18, 0xc6,
0x9f, 0xfb, 0xa5, 0x77, 0x2d, 0xb4, 0xa5, 0xd7,
0xd6, 0x5a, 0x2a, 0x14, 0xa2, 0x0c, 0xb4, 0x0e,
0x6e, 0x6e, 0x50, 0x28, 0x83, 0xec, 0x9a, 0x38,
0x69, 0x6a, 0x7f, 0x80, 0x11, 0x4d, 0x4d, 0xdc,
0x1a, 0xe9, 0x60, 0x52, 0x07, 0x93, 0x42, 0xd4,
0x34, 0xc5, 0x46, 0x05, 0x37, 0x27, 0x75, 0x31,
0x31, 0xb6, 0x16, 0xf9, 0x03, 0x64, 0x30, 0xba,
0xb5, 0x8b, 0xa9, 0x18, 0x13, 0x38, 0xae, 0x72,
0x57, 0xee, 0x7a, 0x77, 0x0e, 0x72, 0x17, 0x43,
0x89, 0x51, 0x7c, 0xa7, 0xf7, 0xfb, 0xe6, 0x79,
0x3e, 0xef, 0xfb, 0x7c, 0x09, 0xec, 0xd5, 0xe2,
0xfd, 0xc2, 0x3b, 0x59, 0x96, 0xc6, 0xf1, 0x17,
0xc5, 0x71, 0xb6, 0xda, 0x8d, 0xb9, 0x4c, 0x14,
0x00, 0x68, 0x73, 0x28, 0xcb, 0xd2, 0xf8, 0x6c,
0xfa, 0x1a, 0x14, 0x45, 0xb1, 0x84, 0x86, 0x61,
0x74, 0x99, 0x0d, 0xc3, 0xc0, 0x93, 0xe5, 0xb2,
0xb5, 0x88, 0x0e, 0x4d, 0xe7, 0xe7, 0x01, 0xe4,
0x00, 0x1d, 0x92, 0x24, 0x41, 0x10, 0x84, 0x2e,
0xa3, 0xf9, 0x66, 0x18, 0x06, 0x24, 0x49, 0x02,
0x00, 0x42, 0xd3, 0x79, 0x03, 0x40, 0x8e, 0x06,
0x90, 0xcb, 0x66, 0x2e, 0xa0, 0xbe, 0xba, 0x04,
0x51, 0x14, 0xd1, 0x6c, 0x36, 0x0f, 0x34, 0x03,
0x00, 0x45, 0x51, 0x20, 0x08, 0x02, 0xa2, 0x28,
0x22, 0x9b, 0x49, 0xe1, 0x4e, 0xe1, 0x79, 0xce,
0x8a, 0xf0, 0xb1, 0xd1, 0x82, 0x20, 0x08, 0x68,
0x34, 0x1a, 0x7f, 0x8c, 0x60, 0x6a, 0x87, 0xc7,
0xf6, 0x22, 0x98, 0xc3, 0xba, 0x1c, 0x44, 0xfc,
0x6e, 0xa5, 0x4b, 0x4c, 0x10, 0x07, 0x21, 0x82,
0x56, 0x67, 0x01, 0x22, 0x67, 0x63, 0x38, 0x4c,
0x59, 0x80, 0xd8, 0x19, 0xfe, 0xff, 0x00, 0x9f,
0xbe, 0x88, 0xff, 0x64, 0x1c, 0x0d, 0x3a, 0x7e,
0x45, 0x0c, 0x9d, 0xcb, 0xd7, 0x40, 0x60, 0xec,
0x50, 0xeb, 0x0d, 0xac, 0x5a, 0x5f, 0x34, 0x77,
0xfd, 0xaa, 0x71, 0xf9, 0x52, 0x5c, 0x7d, 0x54,
0x2e, 0x29, 0x93, 0x93, 0x53, 0xcc, 0xda, 0xda,
0x7b, 0x26, 0x1a, 0x9d, 0xd0, 0xaa, 0xd5, 0x0a,
0x19, 0x8b, 0x4d, 0x69, 0xb5, 0x5a, 0x95, 0x9a,
0x88, 0xc6, 0xf4, 0xb7, 0x95, 0x37, 0xe4, 0xe2,
0xc2, 0x03, 0xaa, 0x2b, 0x02, 0xcb, 0xb2, 0xaa,
0xda, 0x51, 0xb7, 0x79, 0xaf, 0x47, 0x6b, 0xb5,
0x7e, 0x10, 0x43, 0xa1, 0xe1, 0x5e, 0x5d, 0x37,
0xe4, 0xc1, 0xc1, 0x21, 0x5a, 0xd3, 0x74, 0xc9,
0xe1, 0x70, 0xf8, 0x69, 0x86, 0xd9, 0xe4, 0x38,
0x9b, 0xed, 0xf7, 0x23, 0x48, 0xb3, 0xe1, 0x79,
0x7e, 0x87, 0x24, 0xc9, 0xd7, 0x36, 0x9b, 0x0d,
0x23, 0xa7, 0x46, 0x20, 0xed, 0xee, 0x28, 0x03,
0x03, 0x27, 0x74, 0x97, 0xcb, 0x29, 0xbb, 0xfb,
0xdc, 0x6d, 0x00, 0x88, 0x84, 0xc3, 0x47, 0xbd,
0x5e, 0xaf, 0xda, 0x05, 0x28, 0x2c, 0xdc, 0x2b,
0x01, 0xd0, 0x22, 0xe1, 0xd3, 0x17, 0x7d, 0x1e,
0xdf, 0xb1, 0x8d, 0x6f, 0x5f, 0x7d, 0x00, 0x64,
0x9e, 0xf7, 0x90, 0x24, 0x49, 0xd4, 0x7b, 0x1d,
0x3d, 0x9d, 0xfe, 0xfe, 0x20, 0x58, 0x96, 0xd3,
0xed, 0x76, 0xbb, 0x54, 0x2c, 0x3e, 0x4c, 0xef,
0xbf, 0x20, 0x71, 0x33, 0x73, 0x8b, 0x5f, 0x5e,
0x79, 0xac, 0x03, 0xf8, 0xbc, 0xb5, 0xb5, 0x29,
0xf0, 0x6e, 0xde, 0xef, 0x72, 0x3a, 0xe9, 0x5d,
0xa5, 0xcd, 0xac, 0xaf, 0x7f, 0x38, 0x09, 0x00,
0x2b, 0xcf, 0x9e, 0x3a, 0xd3, 0xa9, 0xd9, 0xb6,
0xda, 0x51, 0xce, 0xef, 0x07, 0x94, 0x4b, 0x4b,
0x45, 0xf8, 0xfd, 0xc7, 0x8f, 0x24, 0x13, 0xe9,
0xd1, 0x64, 0x22, 0xdd, 0xa7, 0x28, 0x0a, 0x5e,
0xbe, 0x7a, 0xd1, 0x43, 0x51, 0x74, 0xe0, 0x4a,
0x3c, 0x49, 0xa4, 0x92, 0x33, 0x44, 0x20, 0x10,
0x98, 0xb9, 0x3d, 0x9f, 0xfd, 0xce, 0xb2, 0xdc,
0x86, 0x09, 0xf8, 0x09, 0xe4, 0xcc, 0xc3, 0x08,
0xa5, 0xf7, 0x2c, 0x65, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
/* edit_delete.png - 1974 bytes */
static const unsigned char edit_delete_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x07,
0x1d, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
0x57, 0x5b, 0x6c, 0x1b, 0x45, 0x14, 0xbd, 0xfb,
0x74, 0xd6, 0x8e, 0x1f, 0xb1, 0x9d, 0x87, 0xdd,
0x92, 0x6c, 0x1c, 0x6c, 0x13, 0xda, 0x12, 0xb5,
0xc2, 0x90, 0xa2, 0x44, 0x46, 0x6a, 0xe9, 0x07,
0x20, 0xa0, 0x20, 0x0a, 0x02, 0xc1, 0x07, 0x08,
0x02, 0x12, 0x7c, 0x20, 0x95, 0x47, 0xc5, 0xab,
0x08, 0xaa, 0x56, 0xfc, 0x54, 0xa8, 0x52, 0x45,
0x29, 0x42, 0xe2, 0x07, 0xd1, 0x26, 0x4a, 0x0b,
0x12, 0x01, 0x84, 0x50, 0x88, 0x1c, 0xa7, 0x02,
0x82, 0x84, 0xab, 0x52, 0xa2, 0xa6, 0xf1, 0x5a,
0x89, 0xb1, 0x63, 0xa7, 0x8e, 0x9d, 0xdd, 0xc4,
0xeb, 0xf5, 0x7a, 0x67, 0xf9, 0x18, 0x2d, 0x4e,
0x93, 0x9a, 0x24, 0x02, 0xf1, 0x38, 0x3f, 0x57,
0x77, 0xe6, 0xee, 0xec, 0x39, 0x73, 0xf7, 0xce,
0xdc, 0x05, 0xf8, 0x9f, 0x83, 0x58, 0x2b, 0xe0,
0xbd, 0xf7, 0x8e, 0x1d, 0x3b, 0x7a, 0x74, 0x78,
0x58, 0x96, 0x65, 0xb9, 0x58, 0xbc, 0xfd, 0xf6,
0x7f, 0x8a, 0x18, 0x45, 0x91, 0x24, 0x49, 0x7e,
0xf0, 0xc1, 0x8b, 0x2f, 0xee, 0xdf, 0x7f, 0xe0,
0x40, 0x5f, 0x5f, 0xad, 0x38, 0x7a, 0xad, 0x85,
0x0c, 0xe2, 0xcf, 0x3e, 0xdb, 0xd7, 0xf7, 0xdc,
0x73, 0x00, 0xe5, 0x72, 0xb9, 0x5c, 0x2e, 0xaf,
0x8e, 0xd3, 0x75, 0x5d, 0xd7, 0xf5, 0xb5, 0x89,
0xad, 0x8c, 0x23, 0x08, 0x82, 0x20, 0x96, 0x6d,
0x23, 0xc3, 0x30, 0x0c, 0xc3, 0x00, 0x9c, 0x38,
0x71, 0xf2, 0xe4, 0xf1, 0xe3, 0x4f, 0x3f, 0x8d,
0x47, 0xd7, 0x21, 0x80, 0xe7, 0xef, 0xbc, 0xf3,
0xf0, 0xe1, 0x37, 0xdf, 0xc4, 0xde, 0xc1, 0x83,
0xcb, 0x83, 0x10, 0x02, 0x28, 0x16, 0x8b, 0xc5,
0x62, 0x11, 0xa0, 0x50, 0x28, 0x14, 0x0a, 0x85,
0xb5, 0x09, 0xaf, 0x9c, 0x37, 0x88, 0x91, 0x24,
0x49, 0x92, 0x64, 0xed, 0x38, 0x87, 0xc3, 0xe1,
0x70, 0x38, 0xaa, 0x3e, 0xe6, 0xb5, 0xf2, 0x4d,
0x07, 0x0f, 0x26, 0x12, 0x43, 0x43, 0x07, 0x0e,
0xbc, 0xf5, 0x16, 0xbd, 0x72, 0xe2, 0xb5, 0xd7,
0x5e, 0x78, 0x61, 0xdf, 0x3e, 0x80, 0x8b, 0x17,
0x93, 0x49, 0x51, 0x04, 0x10, 0xc5, 0xa9, 0xa9,
0x4f, 0x3f, 0x05, 0x10, 0x45, 0x51, 0x14, 0x45,
0x80, 0x54, 0x2a, 0x95, 0x4a, 0xa5, 0xd6, 0x4f,
0xdc, 0x00, 0x45, 0x51, 0x14, 0x45, 0x55, 0x77,
0x9c, 0xe3, 0x38, 0x8e, 0xe3, 0x56, 0xc7, 0x21,
0x84, 0x10, 0x42, 0xd5, 0xf7, 0xdd, 0x7f, 0xff,
0x83, 0x0f, 0x3e, 0xfc, 0x70, 0x75, 0x7e, 0x70,
0xb0, 0xbf, 0xff, 0xab, 0xaf, 0x8c, 0x0d, 0x5e,
0x25, 0xa0, 0x8a, 0xe9, 0xe9, 0x74, 0x5a, 0x96,
0x01, 0xca, 0x65, 0x41, 0x90, 0xa4, 0xea, 0xce,
0x0b, 0x82, 0x20, 0x08, 0xc2, 0xfa, 0x89, 0xd7,
0xc2, 0xca, 0x4c, 0x18, 0xf0, 0xf9, 0x7c, 0x3e,
0x9f, 0x0f, 0x60, 0x7a, 0x7a, 0x76, 0x56, 0x92,
0x00, 0x34, 0xcd, 0x66, 0x53, 0x55, 0x00, 0x8f,
0xa7, 0xb1, 0x91, 0x61, 0x56, 0xc7, 0xd7, 0x14,
0xc0, 0x30, 0x34, 0x4d, 0xd3, 0x00, 0xbf, 0xfe,
0x5a, 0x2c, 0x6e, 0xde, 0x0c, 0xf0, 0xc4, 0x13,
0x47, 0x8e, 0x7c, 0xfb, 0x6d, 0x6d, 0x42, 0x57,
0x7f, 0xc9, 0x7f, 0x0d, 0x99, 0x0c, 0xb6, 0x9b,
0x37, 0x03, 0x6c, 0xdd, 0xfa, 0xe7, 0xdb, 0x52,
0x53, 0x80, 0xf1, 0xd8, 0xb6, 0x6d, 0x3b, 0x77,
0xee, 0xde, 0xfd, 0x77, 0x51, 0xdb, 0x38, 0xf6,
0xec, 0xf9, 0xe8, 0xa3, 0xe7, 0x9f, 0x07, 0xb8,
0x70, 0xe1, 0xe5, 0x97, 0xdf, 0x7f, 0x7f, 0x03,
0x02, 0x76, 0xef, 0xde, 0xbe, 0xdd, 0xe5, 0xfa,
0xf7, 0x88, 0x1b, 0x40, 0xe8, 0xd8, 0xb1, 0x4f,
0x3e, 0x01, 0x00, 0xc0, 0x35, 0xb9, 0x6e, 0x01,
0x46, 0x11, 0xff, 0xd7, 0xb1, 0x4c, 0x80, 0xae,
0x03, 0x8c, 0x8c, 0xbc, 0xf3, 0xce, 0xd1, 0xa3,
0xa7, 0x4f, 0x87, 0xc3, 0xff, 0x36, 0xb1, 0x5a,
0xd0, 0x75, 0x00, 0x5d, 0x8f, 0x46, 0x0d, 0x7f,
0x55, 0xe1, 0x1d, 0x39, 0xf2, 0xee, 0xbb, 0x87,
0x0e, 0xe9, 0xfa, 0x43, 0x0f, 0xed, 0xdb, 0xf7,
0xc8, 0x23, 0x57, 0xae, 0xcc, 0xcf, 0xe7, 0x72,
0xb9, 0x9c, 0xdd, 0x7e, 0xf2, 0xe4, 0x87, 0x1f,
0x9e, 0x38, 0x51, 0x2e, 0xef, 0xda, 0xb5, 0x6b,
0xd7, 0x1d, 0x77, 0x30, 0xcc, 0xf8, 0xf8, 0xf8,
0xf8, 0x8f, 0x3f, 0x02, 0x74, 0x77, 0x77, 0x77,
0xef, 0xdc, 0x49, 0x92, 0x91, 0x48, 0x24, 0x12,
0x89, 0x28, 0x4a, 0x38, 0x1c, 0x0e, 0x87, 0xc3,
0x2c, 0x1b, 0x8b, 0x9d, 0x3f, 0xff, 0xf3, 0xcf,
0xaa, 0xba, 0x7d, 0x7b, 0x57, 0xd7, 0x8e, 0x1d,
0x2c, 0x1b, 0x8d, 0x9e, 0x3b, 0x17, 0x8d, 0x2a,
0x4a, 0x28, 0x74, 0xf3, 0xcd, 0xa1, 0x10, 0xc3,
0xc4, 0x62, 0xb1, 0x58, 0x2c, 0x56, 0x2e, 0x77,
0x75, 0x75, 0x75, 0x75, 0x75, 0xb1, 0x6c, 0x36,
0x9b, 0xcd, 0xce, 0xcd, 0x21, 0x74, 0xe1, 0xc2,
0x2f, 0xbf, 0x9c, 0x3f, 0x5f, 0xa9, 0x3c, 0xf6,
0xd8, 0xa3, 0x8f, 0x3e, 0xfe, 0x38, 0xc7, 0x39,
0x9d, 0x4e, 0xa7, 0xd3, 0x99, 0xcf, 0x0f, 0x0e,
0x9e, 0x3d, 0x3b, 0x30, 0xe0, 0x76, 0xbf, 0xf2,
0xca, 0x4b, 0x2f, 0xbd, 0xfa, 0x6a, 0xf5, 0xc0,
0x20, 0x6b, 0x29, 0x25, 0x49, 0x92, 0x24, 0x88,
0x4a, 0x45, 0x55, 0x2b, 0x15, 0x55, 0x5d, 0x58,
0x70, 0xb9, 0x1a, 0x1b, 0xdd, 0xee, 0xc5, 0x45,
0x49, 0x92, 0xa4, 0xc5, 0xc5, 0x42, 0xa1, 0xa5,
0xa5, 0xb9, 0xd9, 0xe3, 0xd1, 0x34, 0x84, 0x10,
0xd2, 0x75, 0x51, 0xf4, 0x7a, 0xbd, 0xde, 0x4d,
0x9b, 0x34, 0x4d, 0xd3, 0x34, 0x0d, 0xa1, 0x5c,
0xae, 0xa1, 0xa1, 0xa1, 0xc1, 0xe9, 0xd4, 0x34,
0x9a, 0x66, 0x18, 0x86, 0x29, 0x14, 0x3c, 0x9e,
0xe6, 0x66, 0xaf, 0x77, 0x61, 0x41, 0x96, 0x8b,
0x45, 0x59, 0xce, 0x64, 0x30, 0x31, 0x00, 0x4d,
0xab, 0x54, 0x10, 0x9a, 0x9b, 0xf3, 0x78, 0x3c,
0x1e, 0x8f, 0x47, 0xd7, 0x6d, 0x36, 0x9b, 0xcd,
0x6a, 0xcd, 0xe5, 0x6c, 0x36, 0x87, 0xc3, 0x6e,
0x5f, 0x58, 0x30, 0x99, 0x4c, 0xa6, 0xba, 0xba,
0xda, 0x27, 0x5c, 0xcd, 0x1a, 0xa0, 0x69, 0x8a,
0x62, 0x18, 0x4d, 0x1b, 0x1b, 0xfb, 0xfe, 0xfb,
0xd1, 0xd1, 0x6f, 0xbe, 0x71, 0xb9, 0x9c, 0x4e,
0x97, 0x6b, 0xcf, 0x9e, 0x40, 0xc0, 0xef, 0x0f,
0x04, 0x00, 0x12, 0x89, 0xe9, 0x69, 0x41, 0x28,
0x97, 0x5b, 0x5b, 0x5b, 0x5b, 0xaf, 0xbb, 0x0e,
0xa1, 0x7c, 0x3e, 0x9f, 0x9f, 0x9f, 0x97, 0x65,
0xa7, 0xb3, 0xa1, 0xc1, 0xe9, 0x2c, 0x95, 0x24,
0x49, 0x92, 0x44, 0x91, 0xe3, 0x5a, 0x5a, 0x5a,
0x5a, 0x9a, 0x9b, 0x11, 0x5a, 0x5a, 0x5a, 0x5a,
0x5a, 0x5a, 0x42, 0x08, 0xfb, 0x04, 0x41, 0x10,
0x24, 0x09, 0x40, 0x10, 0x3c, 0xdf, 0xde, 0xce,
0xf3, 0x14, 0xd5, 0xd4, 0xd4, 0xd4, 0xd4, 0xd4,
0x44, 0x92, 0x33, 0x33, 0xc9, 0x64, 0x22, 0x81,
0x10, 0x16, 0x88, 0x10, 0xc7, 0x99, 0x4c, 0x1c,
0x77, 0xad, 0x1b, 0x60, 0xcd, 0x0c, 0x50, 0x14,
0x49, 0xaa, 0x2a, 0x6e, 0x24, 0x42, 0xa1, 0x9e,
0x9e, 0xdb, 0x6e, 0xeb, 0xed, 0xcd, 0xe5, 0xdc,
0xee, 0xc6, 0x46, 0xb7, 0x5b, 0x55, 0x79, 0xbe,
0xad, 0xad, 0xbd, 0x5d, 0x96, 0x5d, 0x2e, 0x97,
0xcb, 0xed, 0xc6, 0xd7, 0x12, 0x41, 0xc4, 0xe3,
0x56, 0xab, 0xcd, 0x56, 0x5f, 0x5f, 0xa9, 0x60,
0x21, 0xb2, 0x6c, 0xb3, 0x59, 0xad, 0x76, 0xbb,
0xa6, 0x79, 0xbd, 0x5e, 0xaf, 0xc7, 0x33, 0x3f,
0x8f, 0xe3, 0x09, 0x02, 0x21, 0x5d, 0x47, 0x08,
0x21, 0xbb, 0xdd, 0x66, 0xb3, 0xdb, 0x35, 0xcd,
0x62, 0xb1, 0x58, 0x2c, 0x16, 0x84, 0xf0, 0x3c,
0xc0, 0xc4, 0xc4, 0xc4, 0xc4, 0xc5, 0x8b, 0x14,
0x85, 0x79, 0x54, 0x2a, 0x1b, 0x16, 0x40, 0x10,
0x00, 0x04, 0xa1, 0xaa, 0x14, 0x45, 0xd3, 0x14,
0x05, 0x10, 0x08, 0x04, 0x83, 0xc1, 0x20, 0xcf,
0x5f, 0xbe, 0x3c, 0x39, 0x79, 0xe9, 0xd2, 0xc4,
0x04, 0xcf, 0xb7, 0xb5, 0xf1, 0xbc, 0xaa, 0x3a,
0x1c, 0x76, 0xbb, 0xdd, 0x4e, 0xd3, 0xd9, 0x6c,
0x2e, 0x97, 0xc9, 0xc4, 0x62, 0x98, 0x80, 0xd9,
0xcc, 0xf3, 0x3c, 0xcf, 0xf3, 0x8b, 0x8b, 0xf8,
0x93, 0xa0, 0x28, 0x41, 0x10, 0x84, 0x78, 0xfc,
0xa6, 0x9b, 0xc6, 0xc7, 0xc7, 0xc7, 0x7f, 0xf8,
0x61, 0xd3, 0x26, 0x96, 0x65, 0x59, 0x86, 0x01,
0xb0, 0x5a, 0xad, 0xd6, 0xfa, 0x7a, 0x4d, 0x9b,
0x9c, 0xbc, 0x7c, 0x79, 0x72, 0x92, 0xe3, 0xf6,
0xee, 0xbd, 0xef, 0xbe, 0x07, 0x1e, 0x68, 0x6f,
0x4f, 0xa7, 0x53, 0xa9, 0x74, 0xba, 0xa1, 0x21,
0x93, 0xc9, 0x64, 0x66, 0x67, 0x15, 0x65, 0xc3,
0x02, 0x8a, 0x45, 0x59, 0x2e, 0x16, 0xb3, 0x59,
0x86, 0xa1, 0x69, 0x86, 0xd1, 0xf5, 0xfe, 0xfe,
0x81, 0x81, 0x53, 0xa7, 0xf2, 0xf9, 0x72, 0xb9,
0x52, 0x51, 0x94, 0x78, 0x5c, 0x14, 0x45, 0xb1,
0x50, 0xc8, 0xe7, 0x07, 0x06, 0x06, 0x07, 0x4f,
0x9f, 0x16, 0xc5, 0xfa, 0x7a, 0xb3, 0xb9, 0xbe,
0x3e, 0x14, 0x9a, 0x9f, 0xcf, 0xe5, 0xe6, 0xe6,
0x12, 0x09, 0xdc, 0xf3, 0x14, 0x8b, 0x5f, 0x7e,
0xf9, 0xf5, 0xd7, 0x5f, 0x7c, 0x41, 0x92, 0x37,
0xde, 0xb8, 0x65, 0x4b, 0x67, 0x27, 0xc0, 0xd6,
0xad, 0xdb, 0xb6, 0x6d, 0xd9, 0x02, 0x50, 0x2a,
0x95, 0x4a, 0x8a, 0xa2, 0x28, 0xd9, 0xec, 0xdc,
0x5c, 0x36, 0x9b, 0x4e, 0x27, 0x12, 0x82, 0x30,
0x35, 0x05, 0x30, 0x36, 0x36, 0x36, 0x16, 0x8d,
0x02, 0xdc, 0x7b, 0xef, 0x3d, 0xf7, 0xec, 0xdd,
0xbb, 0xb0, 0x80, 0x5b, 0x18, 0xaf, 0x77, 0xc3,
0x35, 0x80, 0x0f, 0xac, 0x72, 0x39, 0x10, 0xe8,
0xec, 0x0c, 0x04, 0xce, 0x9d, 0x2b, 0x95, 0x64,
0x59, 0x96, 0x93, 0xc9, 0xa9, 0xa9, 0xc9, 0xc9,
0x78, 0xfc, 0xee, 0xbb, 0x05, 0x21, 0x1e, 0x17,
0x04, 0x4d, 0x6b, 0x6b, 0xf3, 0xf9, 0x5a, 0x5b,
0x3f, 0xfe, 0x98, 0xa6, 0x69, 0x9a, 0xa6, 0x75,
0x7d, 0x64, 0x64, 0x74, 0x74, 0x64, 0xe4, 0xae,
0xbb, 0x70, 0x6f, 0x84, 0xd0, 0x0d, 0x37, 0x74,
0x76, 0x06, 0x83, 0xc7, 0x8f, 0x63, 0xff, 0x8d,
0x37, 0x8c, 0x66, 0xce, 0x62, 0xb1, 0x5a, 0xcd,
0xe6, 0xb3, 0x67, 0x23, 0x91, 0x68, 0x74, 0x64,
0x64, 0xc7, 0x0e, 0x9c, 0xf1, 0x9f, 0x7e, 0x62,
0xd9, 0xba, 0x3a, 0x96, 0xad, 0x54, 0x3e, 0xfb,
0xec, 0xf3, 0xcf, 0xcf, 0x9c, 0xb9, 0xf5, 0xd6,
0xde, 0xde, 0xde, 0xde, 0x70, 0x78, 0x74, 0x14,
0x73, 0xea, 0xe9, 0x59, 0xb7, 0x00, 0x84, 0x10,
0xd2, 0x34, 0x55, 0x45, 0x48, 0x51, 0x10, 0xe2,
0x38, 0x4c, 0x80, 0x24, 0x3b, 0x3a, 0xfc, 0x7e,
0x9f, 0x6f, 0x68, 0xa8, 0xd6, 0x73, 0xd7, 0x5f,
0xef, 0xf7, 0x77, 0x74, 0x54, 0xe7, 0xf1, 0xb9,
0x44, 0x51, 0xbf, 0xfd, 0x96, 0x4e, 0x27, 0x93,
0x87, 0x0e, 0x19, 0xe3, 0x26, 0x93, 0xc9, 0xc4,
0xb2, 0x00, 0xed, 0xed, 0x3e, 0x1f, 0xcf, 0x0f,
0x0d, 0xe1, 0x2a, 0xd2, 0x75, 0xab, 0xd5, 0x6a,
0x75, 0x38, 0x1a, 0x1b, 0x83, 0x41, 0xbf, 0x3f,
0x18, 0x34, 0x9b, 0x15, 0x05, 0x67, 0x6a, 0x9d,
0x19, 0xa0, 0xff, 0xf0, 0x23, 0x91, 0x68, 0x34,
0x12, 0x31, 0x9b, 0xfd, 0x7e, 0xbf, 0x3f, 0x10,
0xe8, 0xe9, 0xa1, 0x69, 0x45, 0x31, 0x99, 0x00,
0x4a, 0x25, 0x45, 0x29, 0x95, 0x8c, 0x0c, 0x2d,
0xaf, 0x19, 0x0c, 0x5c, 0xcc, 0xd5, 0xe6, 0xce,
0xe8, 0x51, 0x97, 0x8f, 0x13, 0x44, 0xb5, 0x7b,
0x35, 0xba, 0x52, 0x8a, 0xa2, 0x28, 0x9a, 0x06,
0xb0, 0x58, 0x4c, 0x26, 0xb3, 0x19, 0x40, 0x96,
0x97, 0x96, 0x64, 0x99, 0x24, 0x87, 0x87, 0xbf,
0xfb, 0x6e, 0x78, 0x18, 0xbf, 0xb1, 0x0a, 0x93,
0x09, 0x5b, 0x45, 0x59, 0x21, 0xc0, 0x62, 0x49,
0xa7, 0xd3, 0xe9, 0xd9, 0xd9, 0xb7, 0xdf, 0xc6,
0xfe, 0xeb, 0xaf, 0x77, 0x77, 0xdf, 0x72, 0x4b,
0x77, 0x77, 0x2e, 0x67, 0x74, 0xf1, 0x92, 0x24,
0x49, 0x92, 0x04, 0xa0, 0xaa, 0xaa, 0xaa, 0xaa,
0x55, 0x22, 0xb8, 0xdf, 0xd7, 0x75, 0x4d, 0xd3,
0x34, 0x5d, 0x07, 0xd0, 0x34, 0x84, 0x34, 0x6d,
0x59, 0xb1, 0x91, 0xf8, 0xe0, 0xa4, 0x28, 0x8a,
0xba, 0x96, 0x00, 0xfc, 0x09, 0x02, 0xb0, 0x2c,
0xcb, 0xd6, 0xd5, 0x01, 0x24, 0x93, 0xc9, 0xe4,
0xcc, 0x4c, 0x3e, 0x3f, 0x3b, 0x9b, 0xc9, 0xa4,
0x52, 0xa1, 0x50, 0x3e, 0x9f, 0xcf, 0xe7, 0xf3,
0x67, 0xce, 0xe0, 0xd5, 0x3c, 0x1e, 0x6c, 0x13,
0x89, 0x15, 0x17, 0x84, 0xf1, 0x8b, 0xe1, 0xf5,
0x3e, 0xf5, 0x54, 0x5f, 0xdf, 0x93, 0x4f, 0xee,
0xdf, 0xdf, 0xd1, 0xd1, 0xd1, 0xe1, 0xf3, 0x3d,
0xf3, 0x4c, 0xed, 0x4a, 0xb9, 0xfa, 0x3f, 0x60,
0x2d, 0xbf, 0x16, 0x8c, 0xcc, 0xac, 0xb4, 0xf8,
0x86, 0x1e, 0x1a, 0xea, 0xef, 0x3f, 0x75, 0x6a,
0x60, 0xe0, 0xf0, 0xe1, 0x99, 0x99, 0x99, 0x99,
0x64, 0xf2, 0xd2, 0x25, 0xfc, 0x54, 0x36, 0x4b,
0xac, 0x5c, 0x06, 0x5b, 0x96, 0xc5, 0xd6, 0xe8,
0x47, 0xed, 0xf6, 0xab, 0xc7, 0x8d, 0x5f, 0x11,
0x23, 0xde, 0xb0, 0x08, 0x19, 0xb4, 0xaf, 0xbd,
0xae, 0x31, 0x6e, 0x58, 0x23, 0x47, 0xc6, 0x3c,
0x45, 0x5d, 0x3d, 0x6e, 0x58, 0xe3, 0x13, 0xba,
0x72, 0x05, 0x5b, 0x59, 0xc6, 0x56, 0x55, 0xd7,
0xde, 0x9a, 0xff, 0x38, 0x7e, 0x07, 0x0e, 0xaf,
0xa6, 0xde, 0x03, 0x83, 0xf8, 0x4f, 0x00, 0x00,
0x00, 0x18, 0x7a, 0x54, 0x58, 0x74, 0x43, 0x6f,
0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x78,
0xda, 0xcb, 0x4c, 0x51, 0xc8, 0xc9, 0x4f, 0xcf,
0x07, 0x00, 0x0a, 0x18, 0x02, 0x9f, 0xc3, 0x06,
0x77, 0xdf, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};

309
art/tango/edit_find.h Normal file
View File

@@ -0,0 +1,309 @@
/* edit_find.png - 617 bytes */
static const unsigned char edit_find_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xf0, 0x00, 0xf0, 0x00, 0xef, 0x34,
0x06, 0x67, 0x1b, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0b, 0x05, 0x10, 0x0f, 0x05, 0x25,
0xfd, 0xad, 0x2f, 0x00, 0x00, 0x01, 0xf6, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x92, 0x4d,
0x6b, 0x13, 0x51, 0x18, 0x85, 0x9f, 0x3b, 0xc9,
0x24, 0x4d, 0x9a, 0x66, 0x86, 0x4a, 0x52, 0x0a,
0x0a, 0xb5, 0x5d, 0x68, 0x1a, 0x45, 0x14, 0xc1,
0x85, 0xb8, 0x14, 0x0a, 0x55, 0x77, 0xe2, 0x26,
0xbf, 0xc0, 0x6f, 0xa9, 0xf4, 0x1f, 0x88, 0xb6,
0x24, 0x41, 0x44, 0x14, 0x74, 0x59, 0x77, 0x55,
0x10, 0xc5, 0x4d, 0xa8, 0x3b, 0x41, 0xec, 0xa2,
0x54, 0x28, 0xa4, 0x89, 0x56, 0xab, 0x96, 0x50,
0x35, 0x8d, 0xcd, 0x47, 0x27, 0x4d, 0x32, 0x33,
0xd7, 0x45, 0x48, 0x49, 0x42, 0x52, 0xaa, 0x67,
0x77, 0x0f, 0xef, 0x3d, 0xef, 0xe1, 0xbc, 0x47,
0x3c, 0x79, 0xfa, 0x78, 0x31, 0xf7, 0x27, 0x77,
0x8c, 0x3d, 0x40, 0x55, 0xd5, 0xe7, 0x13, 0xb7,
0x26, 0x2f, 0xb6, 0x90, 0xd3, 0xd1, 0xbb, 0x96,
0xdc, 0x23, 0xee, 0x4d, 0xdf, 0x91, 0xed, 0xa2,
0x4e, 0x29, 0xeb, 0x5c, 0x3e, 0xbf, 0xb9, 0xeb,
0x76, 0x4d, 0xd3, 0x3b, 0xf2, 0x4e, 0x21, 0xc4,
0xce, 0x23, 0x99, 0x4c, 0x76, 0x1c, 0x0a, 0x85,
0x42, 0x5d, 0x85, 0x77, 0x1c, 0xb4, 0x0f, 0x66,
0x32, 0x19, 0x66, 0x5f, 0xcc, 0x02, 0x90, 0x98,
0x4b, 0x00, 0xd0, 0xb4, 0x6b, 0x77, 0x07, 0xdf,
0xbe, 0xaf, 0x92, 0x4a, 0xa7, 0x39, 0x7a, 0x6a,
0x8c, 0x6d, 0xc5, 0x8b, 0x69, 0x2b, 0xb8, 0x64,
0x85, 0xd4, 0xfc, 0x6b, 0x26, 0x6e, 0xdf, 0x8c,
0xc4, 0xa2, 0xf7, 0x9f, 0x35, 0xfe, 0x28, 0xed,
0x0e, 0x34, 0x5d, 0x23, 0x95, 0x4e, 0x73, 0xe8,
0xe4, 0x18, 0x9f, 0x0b, 0x5e, 0x06, 0x07, 0x02,
0x8c, 0x1c, 0x08, 0x52, 0x12, 0x3e, 0xb4, 0xd1,
0x71, 0xfc, 0x9a, 0x3e, 0x73, 0xed, 0xc6, 0x95,
0xe3, 0x5d, 0x1d, 0x24, 0xe6, 0x12, 0x0c, 0x87,
0x4f, 0xb3, 0x52, 0x70, 0x73, 0xe9, 0xcc, 0x10,
0xbe, 0x1e, 0x15, 0xd3, 0xb6, 0x51, 0x1d, 0x0a,
0xef, 0x96, 0x25, 0xc1, 0x23, 0xe3, 0x36, 0x4b,
0x6f, 0x16, 0x00, 0x01, 0xa0, 0x74, 0x0a, 0x4b,
0x7a, 0x03, 0x0c, 0x0d, 0xe8, 0x58, 0xb6, 0x64,
0xdb, 0x34, 0xa9, 0xd4, 0x2c, 0xca, 0x55, 0x8b,
0x7e, 0x9f, 0x9b, 0x5f, 0x65, 0xb5, 0x25, 0x09,
0x45, 0x4a, 0x89, 0x94, 0x76, 0x4b, 0x30, 0x6e,
0xb7, 0x0b, 0x84, 0xa0, 0x5c, 0xb5, 0xa8, 0xd6,
0x24, 0x9b, 0x5b, 0x35, 0xdc, 0xaa, 0x83, 0xfd,
0xfd, 0x1e, 0xa4, 0x10, 0x2d, 0x5d, 0x70, 0x02,
0xb6, 0x69, 0x9a, 0x2d, 0x4e, 0x6c, 0x63, 0x83,
0x35, 0xa3, 0x8a, 0xdf, 0xa3, 0xa2, 0xf7, 0xb9,
0xb0, 0x2d, 0x89, 0xdf, 0xe3, 0xe4, 0xd3, 0x46,
0x81, 0x7d, 0x3d, 0x96, 0x9d, 0x6b, 0x72, 0xae,
0xd4, 0x2b, 0xea, 0x42, 0xd3, 0x74, 0x34, 0x4d,
0xe7, 0xc2, 0xb9, 0xf3, 0xa4, 0x17, 0xde, 0x12,
0xec, 0x13, 0x7c, 0xf9, 0x99, 0x27, 0x9b, 0x2b,
0x91, 0x37, 0x2a, 0x7c, 0x5c, 0x59, 0xa7, 0x54,
0xae, 0x90, 0x5b, 0x7a, 0xe5, 0x2c, 0x15, 0x8b,
0x3f, 0x1a, 0x02, 0x22, 0x1a, 0x9f, 0x9a, 0xb1,
0x2c, 0x2b, 0xd2, 0x7c, 0x0d, 0xc3, 0x30, 0x70,
0x38, 0x54, 0x4e, 0x9c, 0x8d, 0xb0, 0xbc, 0x56,
0x64, 0xcb, 0x54, 0x18, 0xec, 0x95, 0xac, 0x2f,
0xbe, 0x64, 0xf8, 0xe0, 0x08, 0x00, 0x1f, 0xe6,
0xdf, 0xa7, 0x1e, 0x3e, 0x78, 0x74, 0x58, 0x74,
0x6b, 0xd8, 0xd5, 0xeb, 0x97, 0xa7, 0x02, 0x81,
0xe0, 0x64, 0x33, 0xe7, 0xeb, 0xf5, 0x11, 0x1e,
0x0d, 0xf3, 0x3b, 0x9b, 0xad, 0xf7, 0x65, 0xf5,
0x2b, 0x82, 0x7f, 0x44, 0x2c, 0x1e, 0x95, 0x0d,
0x91, 0xff, 0x12, 0x00, 0x94, 0x58, 0x3c, 0x6a,
0x01, 0x94, 0x0d, 0x83, 0xbf, 0x06, 0x8c, 0xf6,
0xd3, 0x7f, 0x33, 0xe7, 0x2e, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82};
/* edit_find.png - 1797 bytes */
static const unsigned char edit_find_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
0x90, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x6b, 0x4c, 0x53, 0x67, 0x18, 0x7e, 0xce,
0xb5, 0x2d, 0x15, 0x2a, 0xd8, 0x23, 0x68, 0x14,
0xc9, 0x60, 0xb4, 0x04, 0xab, 0x46, 0x64, 0x2e,
0xa8, 0x40, 0xcc, 0xa6, 0x01, 0xa7, 0xdb, 0x62,
0x16, 0x17, 0x4d, 0xf6, 0x63, 0xfc, 0xda, 0x88,
0xb7, 0x68, 0x96, 0x45, 0x8d, 0xc6, 0x0c, 0xd8,
0xd8, 0xbc, 0x10, 0x37, 0xe6, 0x66, 0xb6, 0x69,
0x62, 0xc6, 0x94, 0x2c, 0x9a, 0x99, 0xa0, 0x59,
0x26, 0x64, 0xba, 0x8d, 0x59, 0x27, 0xde, 0x20,
0x14, 0x6f, 0x28, 0xa4, 0x55, 0x0b, 0xd8, 0x1e,
0x0e, 0xa5, 0xf4, 0x9c, 0xd3, 0x73, 0xce, 0x7e,
0x7c, 0x6b, 0x60, 0x68, 0x37, 0x99, 0xb2, 0xfd,
0xd9, 0xfb, 0xe7, 0xcd, 0xe9, 0xf7, 0x9d, 0xef,
0x7b, 0x9e, 0xf7, 0x79, 0x2f, 0xa7, 0xc0, 0xff,
0xf6, 0xdf, 0x1a, 0x15, 0x6f, 0x61, 0xff, 0xfe,
0xcf, 0x3f, 0xaf, 0xad, 0xbd, 0x7e, 0x7d, 0x70,
0x70, 0x70, 0x30, 0x14, 0xca, 0xca, 0x22, 0xbf,
0x1a, 0xc6, 0x23, 0x0f, 0xa1, 0x00, 0x8a, 0xa2,
0x28, 0xb2, 0xc3, 0x30, 0x86, 0x77, 0x3d, 0x7a,
0xff, 0xa3, 0x4e, 0x20, 0x76, 0xea, 0xd4, 0xa6,
0x4d, 0x1b, 0x37, 0xbe, 0xf3, 0xce, 0x4b, 0x2f,
0x3d, 0x31, 0xb3, 0xea, 0xea, 0x8f, 0x3e, 0xaa,
0xaa, 0xd2, 0x75, 0xe3, 0x0f, 0xd3, 0x75, 0x5d,
0xd7, 0xf5, 0xa7, 0xef, 0x63, 0xb6, 0x6b, 0xd7,
0x9e, 0x3d, 0xd5, 0xd5, 0x9a, 0x36, 0x56, 0x9c,
0xec, 0x5f, 0x2f, 0xc7, 0x22, 0x48, 0x51, 0x92,
0x24, 0x49, 0xfd, 0xfd, 0x4f, 0x1c, 0x97, 0x87,
0x2c, 0x29, 0x29, 0x29, 0xc9, 0x66, 0x1b, 0x7d,
0xdf, 0xe3, 0x1b, 0x1d, 0x6f, 0x81, 0x48, 0xfa,
0xf4, 0x01, 0x0f, 0x43, 0x1d, 0x99, 0x6a, 0xff,
0xdc, 0xe2, 0x2a, 0x10, 0xef, 0x02, 0x8f, 0xc7,
0xe3, 0xf1, 0x78, 0x9e, 0x1c, 0xb8, 0xd3, 0xe9,
0x74, 0xe6, 0xe4, 0x8c, 0x23, 0x81, 0x78, 0x0a,
0x38, 0x9d, 0x4e, 0xa7, 0xd3, 0x39, 0x76, 0xc0,
0xa3, 0x9f, 0xff, 0x33, 0x05, 0x3a, 0x3a, 0x3a,
0x3a, 0x3a, 0x3a, 0xfe, 0xfe, 0x60, 0xb7, 0xfb,
0xb7, 0xdf, 0xdc, 0x6e, 0xa0, 0xbb, 0xbb, 0xab,
0xeb, 0xce, 0x1d, 0x80, 0x14, 0x2d, 0x40, 0x0a,
0x18, 0x60, 0x59, 0x96, 0x65, 0x59, 0x60, 0xd1,
0xa2, 0x45, 0x8b, 0x8a, 0x8a, 0xc6, 0x81, 0x40,
0x3c, 0x05, 0x72, 0x72, 0x72, 0x72, 0x1e, 0x25,
0x7d, 0x57, 0x57, 0x77, 0x77, 0x57, 0x17, 0x70,
0xf0, 0xe0, 0xa1, 0x43, 0x07, 0x0f, 0x02, 0x6b,
0xd6, 0xac, 0x5e, 0xbd, 0x66, 0x0d, 0x50, 0x5a,
0x5a, 0x52, 0xb2, 0x7c, 0x39, 0xa0, 0x28, 0xaa,
0xaa, 0x69, 0x80, 0xa6, 0x91, 0xb0, 0xf0, 0x3c,
0xc3, 0x50, 0x14, 0x30, 0x30, 0x20, 0x49, 0xc1,
0x20, 0xd0, 0xd4, 0xd4, 0xd4, 0xd4, 0xd8, 0xc8,
0x30, 0x5b, 0xb6, 0x6c, 0xdb, 0xf6, 0xee, 0xbb,
0x05, 0x05, 0x55, 0x55, 0x15, 0x15, 0x1f, 0x7c,
0xd0, 0xdc, 0x3c, 0x6e, 0x0a, 0xc4, 0xd6, 0xfb,
0xfb, 0xfb, 0xfb, 0x45, 0x11, 0x38, 0x75, 0xea,
0xfb, 0xef, 0x4f, 0x9e, 0x04, 0xca, 0xcb, 0xdf,
0x7e, 0x7b, 0xfd, 0x7a, 0xa0, 0xb1, 0xf1, 0xe2,
0xc5, 0xbb, 0x77, 0x81, 0xeb, 0xd7, 0x45, 0xd1,
0xef, 0x07, 0x78, 0xde, 0x62, 0x49, 0x48, 0x00,
0x54, 0x95, 0x50, 0xd0, 0x34, 0x59, 0x0e, 0x87,
0x81, 0x59, 0xb3, 0x26, 0x4f, 0x36, 0x0c, 0x60,
0xe3, 0xc6, 0xf5, 0xeb, 0x37, 0x6d, 0x02, 0x6a,
0x6a, 0xf6, 0xed, 0xdb, 0xbd, 0xfb, 0xa7, 0x9f,
0x2a, 0x2a, 0x2a, 0x2b, 0x77, 0xee, 0x9c, 0x37,
0x6f, 0xdb, 0xb6, 0xad, 0x5b, 0x77, 0xec, 0xb8,
0x74, 0xe9, 0xa9, 0x29, 0xe0, 0x70, 0x38, 0x1c,
0x0e, 0x07, 0x21, 0x00, 0x00, 0xef, 0xbd, 0x57,
0x59, 0xb9, 0x73, 0x27, 0x50, 0x5e, 0xfe, 0xd6,
0x5b, 0xeb, 0xd6, 0x01, 0xdf, 0x7d, 0x77, 0xe1,
0x42, 0x4f, 0x0f, 0x70, 0xef, 0x5e, 0x24, 0x92,
0x94, 0x04, 0xbc, 0xfe, 0x7a, 0x71, 0xf1, 0xb4,
0x69, 0xc0, 0xd4, 0xa9, 0x29, 0x29, 0x16, 0x0b,
0x10, 0x8d, 0x92, 0x54, 0xf2, 0x78, 0xbc, 0x5e,
0x49, 0x02, 0x1a, 0x1b, 0xaf, 0x5e, 0xed, 0xe9,
0x01, 0x44, 0xd1, 0xed, 0xf6, 0xf9, 0x80, 0xb5,
0x6b, 0xcb, 0xcb, 0x37, 0x6c, 0xa0, 0xe9, 0x9a,
0x9a, 0x7d, 0xfb, 0xf6, 0xec, 0x39, 0x7b, 0x96,
0xdc, 0x9a, 0x98, 0x18, 0x0f, 0x27, 0x13, 0x6f,
0xe1, 0xc5, 0x17, 0x97, 0x2c, 0x79, 0xe1, 0x85,
0x1d, 0x3b, 0x16, 0x2c, 0x28, 0x28, 0x58, 0xb8,
0x90, 0xa2, 0x22, 0x91, 0x48, 0x64, 0x68, 0x08,
0x68, 0x6f, 0x6f, 0x6f, 0xf7, 0x78, 0x80, 0xf3,
0xe7, 0x49, 0x8e, 0x4f, 0x9f, 0x3e, 0x7d, 0x7a,
0x7a, 0x3a, 0xd0, 0xd9, 0x19, 0x08, 0xb0, 0x2c,
0xd0, 0xd9, 0x19, 0x0a, 0x59, 0x2c, 0xc0, 0x9b,
0x6f, 0x16, 0x17, 0xa7, 0xa7, 0x03, 0x93, 0x27,
0xdb, 0x6c, 0x66, 0x33, 0x60, 0x36, 0x73, 0x1c,
0xc3, 0x00, 0x9a, 0xa6, 0xeb, 0x00, 0x60, 0xb1,
0x98, 0x4c, 0x2c, 0x0b, 0x58, 0xad, 0x66, 0x33,
0xcb, 0x02, 0xad, 0xad, 0x77, 0xef, 0x2a, 0x0a,
0x60, 0x32, 0xe9, 0x7a, 0x38, 0xac, 0x28, 0xa9,
0xa9, 0xc9, 0xc9, 0x66, 0x33, 0x45, 0xcd, 0x9a,
0x35, 0x7b, 0xb6, 0xcb, 0x15, 0x0a, 0x9d, 0x39,
0xf3, 0xe3, 0x8f, 0x67, 0xcf, 0xba, 0xdd, 0xa3,
0x71, 0xc6, 0x9d, 0x03, 0xf1, 0x52, 0xca, 0xe1,
0x70, 0x38, 0xb2, 0xb3, 0x81, 0xe6, 0xe6, 0x5f,
0x7f, 0xfd, 0xf9, 0x67, 0x20, 0x2f, 0x6f, 0xee,
0xdc, 0xbc, 0x3c, 0xe0, 0xdc, 0xb9, 0xae, 0x2e,
0x55, 0x05, 0x16, 0x2c, 0x70, 0x38, 0x04, 0x01,
0xe0, 0x38, 0x8e, 0x63, 0x59, 0x12, 0x71, 0x00,
0x88, 0x44, 0x48, 0x0d, 0x90, 0xe9, 0x0b, 0xa8,
0x6a, 0x34, 0xaa, 0x69, 0x80, 0xd7, 0xdb, 0xd7,
0x37, 0x34, 0x04, 0x30, 0x8c, 0xae, 0x2b, 0x0a,
0xd0, 0xd6, 0x46, 0x12, 0xee, 0xb9, 0xe7, 0xf2,
0xf3, 0xe7, 0xcf, 0x37, 0x9b, 0x7b, 0x7a, 0x7a,
0x7a, 0xfc, 0xfe, 0x9a, 0x9a, 0x78, 0xb8, 0xc6,
0x4c, 0x80, 0xa4, 0x17, 0x01, 0xc8, 0x71, 0x80,
0xae, 0x03, 0x34, 0x0d, 0x58, 0xad, 0x64, 0xa2,
0x4e, 0x9a, 0x94, 0x98, 0xc8, 0x71, 0x80, 0x2c,
0xab, 0x6a, 0x34, 0x3a, 0xec, 0x15, 0x85, 0x50,
0x19, 0x1a, 0x52, 0x14, 0x4d, 0x03, 0xfa, 0xfa,
0x44, 0x31, 0x1c, 0x06, 0x9c, 0xce, 0x69, 0xd3,
0x12, 0x13, 0x01, 0x93, 0x49, 0x96, 0x7d, 0x3e,
0x40, 0x14, 0x55, 0x95, 0x65, 0x01, 0x8b, 0x85,
0xd4, 0x0c, 0xb9, 0x27, 0x7e, 0xc3, 0xfd, 0xdb,
0x22, 0x8e, 0xb5, 0xbf, 0x91, 0xfd, 0x7b, 0xe4,
0x3e, 0x93, 0x89, 0x44, 0x9a, 0xe3, 0x68, 0xda,
0x30, 0x80, 0xde, 0x5e, 0x51, 0x8c, 0x44, 0x86,
0xbb, 0x4c, 0xcc, 0x64, 0x59, 0x96, 0xa3, 0x51,
0xa0, 0xb7, 0x57, 0x92, 0x64, 0x19, 0x20, 0x6f,
0x01, 0x34, 0xcd, 0x30, 0x0c, 0x43, 0x82, 0xa2,
0xeb, 0x80, 0xa6, 0x45, 0xa3, 0xaa, 0xaa, 0x69,
0xb2, 0x2c, 0xcb, 0xb2, 0xcc, 0x30, 0xe4, 0x7e,
0x55, 0x1d, 0x33, 0x81, 0x18, 0x0d, 0x4d, 0xd3,
0x34, 0x4d, 0x7b, 0x98, 0x40, 0x6e, 0x6e, 0x6e,
0xee, 0xcc, 0x99, 0x80, 0xcf, 0xe7, 0xf3, 0xf9,
0x7c, 0xc0, 0xc4, 0x89, 0x3c, 0xcf, 0xf3, 0xc0,
0xcd, 0x9b, 0x3e, 0x5f, 0x30, 0x18, 0x7b, 0x1b,
0xb0, 0x58, 0x78, 0x9e, 0xa2, 0x80, 0x09, 0x13,
0x48, 0xae, 0xc7, 0xda, 0xa9, 0xd5, 0xca, 0xf3,
0x2c, 0x0b, 0x18, 0x06, 0x21, 0x1a, 0x08, 0x84,
0xc3, 0x14, 0x05, 0xcc, 0x98, 0x21, 0x08, 0x34,
0x4d, 0x51, 0x81, 0x40, 0x20, 0xf0, 0xe0, 0x81,
0x2c, 0xa7, 0xa5, 0xa5, 0xa5, 0x4d, 0x99, 0x72,
0xee, 0xdc, 0x3f, 0x4e, 0xa1, 0x91, 0x04, 0x46,
0x2a, 0xe3, 0x72, 0xcd, 0x9c, 0xe9, 0x72, 0x01,
0xe7, 0xcf, 0x5f, 0xb8, 0xe0, 0x76, 0x03, 0xcb,
0x96, 0xe5, 0xe5, 0xa5, 0xa6, 0x02, 0xbd, 0xbd,
0x43, 0x43, 0x24, 0xe2, 0x24, 0x65, 0x0c, 0xc3,
0x30, 0x48, 0x74, 0x75, 0xdd, 0x30, 0x86, 0x6b,
0x21, 0x1a, 0x25, 0xcf, 0xa2, 0x18, 0x0a, 0x45,
0x22, 0x80, 0xd9, 0x2c, 0x08, 0x99, 0x99, 0x40,
0x49, 0xc9, 0x9c, 0x39, 0x82, 0x40, 0xd3, 0x5f,
0x7d, 0x75, 0xe8, 0xd0, 0x97, 0x5f, 0x4a, 0x92,
0x28, 0x8a, 0x62, 0x30, 0xd8, 0xd4, 0x34, 0x46,
0x02, 0xc3, 0xe2, 0x9b, 0x4c, 0x26, 0x93, 0xc9,
0x04, 0xd8, 0xed, 0x76, 0xbb, 0xdd, 0x0e, 0x08,
0x82, 0x20, 0x08, 0x02, 0xf0, 0xfc, 0xf3, 0xf3,
0xe7, 0x17, 0x14, 0x00, 0x7e, 0xbf, 0xdf, 0xef,
0xf7, 0x03, 0xb7, 0x6e, 0xb5, 0xb7, 0xb7, 0xb4,
0x00, 0x4b, 0x97, 0xe6, 0xe6, 0x26, 0x25, 0x01,
0x17, 0x2f, 0xde, 0xb9, 0x23, 0x49, 0x40, 0x73,
0x73, 0x6b, 0x2b, 0x99, 0xc4, 0x14, 0xc5, 0x30,
0xc0, 0xc0, 0x80, 0x2c, 0x1b, 0x06, 0xd0, 0xd0,
0xf0, 0xcb, 0x2f, 0xd7, 0xae, 0x01, 0xa7, 0x4f,
0xb7, 0xb6, 0xf6, 0xf6, 0x02, 0x2b, 0x57, 0xba,
0x5c, 0x2c, 0x0b, 0x9c, 0x39, 0x73, 0xfa, 0xf4,
0x89, 0x13, 0x86, 0x31, 0x63, 0x46, 0x7a, 0x7a,
0x46, 0x86, 0xd5, 0x1a, 0x0a, 0x0d, 0x0c, 0x0c,
0x0e, 0x6e, 0xde, 0xfc, 0xda, 0x6b, 0xab, 0x56,
0xad, 0x5c, 0x39, 0x65, 0xca, 0x43, 0x48, 0xe3,
0x31, 0x23, 0xdf, 0xe7, 0xc7, 0x8f, 0x13, 0x05,
0x5e, 0x79, 0x65, 0x74, 0x6d, 0x8c, 0x36, 0xaf,
0xd7, 0xeb, 0xf5, 0x7a, 0x81, 0xac, 0xac, 0xcc,
0xcc, 0xec, 0x6c, 0x60, 0xd9, 0xb2, 0x57, 0x5f,
0x5d, 0xbd, 0x1a, 0xf8, 0xe1, 0x87, 0x2b, 0x57,
0xfc, 0x7e, 0xa0, 0xbb, 0xfb, 0xc1, 0x03, 0x45,
0x01, 0x14, 0xc5, 0x30, 0x68, 0x1a, 0x78, 0xf6,
0x59, 0x41, 0xe0, 0x38, 0xa0, 0xb0, 0xd0, 0xe9,
0x4c, 0x4e, 0x06, 0x6a, 0x6b, 0xf7, 0xee, 0xad,
0xa8, 0xd0, 0xf5, 0x15, 0x2b, 0x96, 0x2f, 0x7f,
0xf9, 0x65, 0x9a, 0x6e, 0x69, 0xb9, 0x74, 0xa9,
0xa5, 0x05, 0x08, 0x06, 0x83, 0xc1, 0x40, 0x40,
0xd7, 0x25, 0x49, 0x92, 0x24, 0xa9, 0xaf, 0x8f,
0xe7, 0x39, 0x8e, 0xe7, 0x97, 0x2e, 0xfd, 0xe4,
0x93, 0x8f, 0x3f, 0xfe, 0xf4, 0xd3, 0xcb, 0x97,
0x1f, 0xf3, 0x83, 0x99, 0xfd, 0xa3, 0x56, 0xac,
0x56, 0xe2, 0x63, 0x83, 0x25, 0xe6, 0x27, 0x4c,
0x28, 0x2a, 0x2a, 0x2e, 0x2e, 0x2c, 0x74, 0xb9,
0x1c, 0x0e, 0xa7, 0x33, 0x3b, 0xbb, 0xba, 0xda,
0x6e, 0x4f, 0x49, 0xb1, 0xdb, 0x15, 0x65, 0xe2,
0xc4, 0xe4, 0xe4, 0x94, 0x14, 0x8e, 0xcb, 0xcf,
0x9f, 0x37, 0x2f, 0x3f, 0xdf, 0x6a, 0xcd, 0xc8,
0xc8, 0xc8, 0xc8, 0xc8, 0x48, 0x48, 0xa8, 0xab,
0xfb, 0xe6, 0x9b, 0xba, 0xba, 0xdb, 0xb7, 0x6f,
0xdd, 0xea, 0xec, 0xbc, 0x71, 0x83, 0xe7, 0x43,
0x21, 0x49, 0x0a, 0x87, 0xab, 0xaa, 0x52, 0x53,
0xd3, 0xd2, 0x04, 0xa1, 0xb6, 0xb6, 0xb4, 0xb4,
0xa4, 0xa4, 0xb4, 0x14, 0xb8, 0x7a, 0xb5, 0xad,
0xad, 0xb5, 0x15, 0x28, 0x2c, 0x5c, 0xb8, 0xb0,
0xa8, 0x48, 0xd7, 0xbf, 0xfe, 0xba, 0xae, 0xee,
0xf0, 0x61, 0x9a, 0x26, 0x04, 0x28, 0xea, 0x31,
0xdb, 0x68, 0x34, 0x4a, 0xbc, 0x24, 0x11, 0x7f,
0xff, 0x3e, 0xf1, 0x37, 0x6f, 0x12, 0xdf, 0xd6,
0x46, 0x06, 0xcd, 0x91, 0x23, 0x07, 0x0e, 0x7c,
0xf6, 0xd9, 0x17, 0x5f, 0x3c, 0xf3, 0x0c, 0x4d,
0xb3, 0x2c, 0x45, 0x55, 0x56, 0xaa, 0x6a, 0x34,
0x1a, 0x89, 0x5c, 0xbe, 0xfc, 0xed, 0xb7, 0xc7,
0x8e, 0x1d, 0x3d, 0x4a, 0x51, 0xbb, 0x77, 0xef,
0xdd, 0xfb, 0xe1, 0x87, 0xa4, 0xfb, 0x18, 0xc6,
0xb5, 0x6b, 0x59, 0x59, 0x59, 0x59, 0x99, 0x99,
0xdb, 0xb7, 0xd7, 0xd7, 0xd7, 0xd7, 0xd7, 0xd7,
0xef, 0xdf, 0xaf, 0xeb, 0x9a, 0x06, 0xbc, 0xff,
0x7e, 0x43, 0xc3, 0xc9, 0x93, 0x0d, 0x0d, 0xc0,
0xe2, 0xc5, 0xc5, 0xc5, 0x8b, 0x17, 0x03, 0x36,
0x9b, 0xcd, 0x66, 0xb3, 0xd1, 0x0f, 0xe1, 0x1d,
0xc7, 0xbf, 0x2c, 0x00, 0x99, 0x10, 0x23, 0x7d,
0xac, 0xb6, 0x46, 0x7f, 0xa4, 0xc4, 0x9e, 0x87,
0x93, 0xb3, 0xac, 0xac, 0xac, 0xac, 0xac, 0xec,
0x8d, 0x37, 0x2c, 0x96, 0x84, 0x04, 0x93, 0xe9,
0xc0, 0x81, 0x3f, 0xef, 0x5b, 0xb5, 0x8a, 0x28,
0x50, 0x5f, 0x3f, 0xbe, 0xf8, 0xff, 0x05, 0xfb,
0x1d, 0x75, 0xcb, 0xe2, 0xbb, 0xec, 0x47, 0x44,
0xaf, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};

View File

@@ -0,0 +1,315 @@
/* edit_find_replace.png - 776 bytes */
static const unsigned char edit_find_replace_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd6, 0x01, 0x06, 0x16, 0x04, 0x03, 0xf5,
0x76, 0x68, 0x82, 0x00, 0x00, 0x02, 0x95, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x93, 0x4d,
0x6c, 0x0c, 0x61, 0x18, 0xc7, 0x7f, 0x33, 0xb3,
0xb3, 0xb5, 0x48, 0xb7, 0xcc, 0x2c, 0xc1, 0x81,
0x56, 0xd0, 0x89, 0xe0, 0xa0, 0x89, 0x83, 0xa0,
0xb8, 0x34, 0x71, 0x20, 0x52, 0x49, 0x89, 0xaf,
0x63, 0x4b, 0x8a, 0x5a, 0x41, 0xa4, 0x44, 0x10,
0x82, 0x8a, 0x22, 0x71, 0xad, 0x44, 0x13, 0xc4,
0x36, 0x12, 0xd1, 0x83, 0x4b, 0x7d, 0xb4, 0x44,
0x48, 0x89, 0x8f, 0x9d, 0xa5, 0x45, 0x62, 0x5b,
0x95, 0xd4, 0x6e, 0x77, 0x67, 0x3f, 0xba, 0x5d,
0xbb, 0x3b, 0xaf, 0x03, 0x3b, 0x69, 0x2f, 0x4e,
0xfe, 0xc9, 0x93, 0x3c, 0xef, 0x9b, 0xfc, 0x7f,
0x79, 0x9e, 0x37, 0xff, 0x57, 0x62, 0x9c, 0xf6,
0x1d, 0x68, 0xd4, 0x34, 0x4d, 0x8b, 0x14, 0xcf,
0xd1, 0x68, 0x54, 0xbf, 0xda, 0x7a, 0x2d, 0xca,
0x3f, 0x24, 0x15, 0x1b, 0xff, 0xa1, 0x03, 0x6b,
0x4b, 0xbd, 0x65, 0x5d, 0x4b, 0x56, 0xd4, 0x88,
0x14, 0x53, 0x25, 0x55, 0x8c, 0x89, 0xbe, 0x97,
0x0f, 0xa4, 0x84, 0x15, 0x5f, 0x77, 0xa9, 0xa5,
0xf5, 0xd1, 0x3f, 0x01, 0x8d, 0xfb, 0xf7, 0x6a,
0xba, 0xee, 0x8b, 0x2c, 0xac, 0xaa, 0x61, 0x20,
0xed, 0x61, 0xe5, 0xe2, 0x59, 0x98, 0xe1, 0x18,
0xe9, 0x64, 0x02, 0x2b, 0xd4, 0x89, 0xcb, 0xa5,
0xa0, 0x28, 0xb2, 0x63, 0x52, 0x55, 0x35, 0xe0,
0x6f, 0x3a, 0xbc, 0x05, 0xc0, 0x05, 0xa0, 0xeb,
0xbe, 0x48, 0xf9, 0xe2, 0x95, 0x7c, 0xb1, 0x4a,
0xa8, 0x5b, 0x5d, 0xce, 0x24, 0xb7, 0x82, 0xaa,
0xc8, 0x74, 0x87, 0x04, 0x33, 0x96, 0x6c, 0x60,
0xf8, 0x7d, 0x27, 0xc7, 0x8e, 0x36, 0x3b, 0x80,
0xf3, 0x17, 0xcf, 0xd6, 0x16, 0x7b, 0x97, 0x73,
0x3b, 0xd9, 0xc7, 0xbc, 0xe9, 0xa5, 0x14, 0x6c,
0x41, 0x36, 0x57, 0x20, 0x9b, 0xb3, 0xf1, 0x95,
0x96, 0xf0, 0x75, 0x68, 0x0c, 0x09, 0xb0, 0xac,
0x38, 0x00, 0x5e, 0x6f, 0x19, 0x25, 0x6f, 0x8e,
0x73, 0x79, 0xab, 0x2c, 0x80, 0x1d, 0xce, 0x5c,
0x6a, 0x21, 0xc1, 0xe0, 0x70, 0x82, 0x70, 0x24,
0x43, 0x3c, 0x9d, 0x67, 0x8e, 0xe6, 0xc1, 0x2d,
0x17, 0xd0, 0xa7, 0xd8, 0x00, 0x84, 0x42, 0x21,
0x00, 0x5a, 0xb7, 0x29, 0xec, 0xba, 0xd2, 0x43,
0x75, 0xed, 0x7e, 0x80, 0x9b, 0x32, 0x40, 0xc2,
0x8a, 0xaf, 0xeb, 0x7b, 0xdd, 0xc5, 0xcc, 0x52,
0x09, 0x73, 0x60, 0x84, 0x91, 0xd4, 0x18, 0x2f,
0xcc, 0xef, 0xc4, 0x52, 0x19, 0xa2, 0xef, 0xef,
0xb3, 0x69, 0xe3, 0x26, 0x0c, 0xc3, 0xa0, 0xad,
0x41, 0x63, 0xf7, 0xd5, 0x67, 0x0c, 0x3e, 0x6d,
0xe7, 0x9d, 0x39, 0x58, 0x00, 0x90, 0x01, 0xa6,
0x95, 0x4d, 0xef, 0xaa, 0x28, 0x9f, 0x4f, 0xf8,
0xd5, 0x3d, 0x2a, 0x7c, 0x25, 0xf4, 0x84, 0x7e,
0x92, 0x1c, 0xcd, 0x32, 0xfc, 0xba, 0x03, 0x5d,
0xd3, 0x18, 0x4d, 0x8f, 0x3a, 0xe6, 0x81, 0x27,
0x37, 0x79, 0xd7, 0x1f, 0x65, 0xc4, 0xec, 0x50,
0x80, 0x2a, 0xe9, 0xcc, 0x99, 0x53, 0x62, 0xee,
0xbc, 0x72, 0x7c, 0xba, 0x4e, 0xd0, 0x0c, 0x92,
0x4a, 0xa7, 0x9c, 0x67, 0x59, 0xb6, 0x74, 0x19,
0xd5, 0x6b, 0xaa, 0x69, 0x6b, 0xd0, 0xd8, 0x79,
0xa9, 0x9b, 0x70, 0x4f, 0x3b, 0x6f, 0x3f, 0x45,
0x89, 0x99, 0x01, 0x80, 0xaa, 0xa6, 0x5b, 0x76,
0xaf, 0x0b, 0x70, 0xcc, 0x07, 0x9b, 0xfc, 0x58,
0x56, 0xdc, 0xd9, 0x17, 0xf8, 0x63, 0x6e, 0x79,
0x4a, 0xff, 0xc3, 0x36, 0x3e, 0x7e, 0x4f, 0x12,
0x33, 0x03, 0xfc, 0x5a, 0x54, 0xcf, 0x91, 0x93,
0xd7, 0x7b, 0x01, 0x49, 0x6e, 0x6e, 0x3e, 0x21,
0x05, 0xcd, 0x20, 0xf9, 0xc2, 0x2f, 0xbb, 0x68,
0x32, 0x0c, 0x03, 0xc3, 0x30, 0xa8, 0xac, 0xac,
0xe4, 0x9b, 0xbc, 0x82, 0xe0, 0xf3, 0xe7, 0xf4,
0x0f, 0x59, 0xc4, 0x82, 0x77, 0xa9, 0x3b, 0xfd,
0x02, 0xdb, 0x33, 0xdb, 0xc9, 0x90, 0x0c, 0xe0,
0x3f, 0x78, 0x48, 0x02, 0x10, 0xc2, 0x61, 0x20,
0x84, 0xe0, 0xc6, 0x1e, 0x9d, 0xcf, 0x3f, 0xa2,
0xdc, 0x09, 0x04, 0x88, 0x7c, 0xe8, 0x60, 0x55,
0x7d, 0x07, 0x93, 0xb4, 0x05, 0xe4, 0x72, 0xb9,
0x62, 0x04, 0x84, 0x3c, 0x2e, 0x95, 0x76, 0x3e,
0x9f, 0x9f, 0x00, 0x68, 0xba, 0x65, 0xb3, 0x7e,
0xe6, 0x67, 0x6a, 0x36, 0xef, 0x66, 0x79, 0xc3,
0x63, 0xc4, 0xe4, 0x39, 0x24, 0x93, 0x49, 0x72,
0xb9, 0x3c, 0x80, 0x32, 0x31, 0x48, 0x80, 0xaa,
0xba, 0xf1, 0x7a, 0xdd, 0x0e, 0x20, 0x93, 0xc9,
0x90, 0x48, 0x24, 0xc8, 0x66, 0xb3, 0x28, 0x8a,
0x82, 0xaa, 0xaa, 0x7f, 0xcb, 0x05, 0x60, 0x4f,
0x00, 0x28, 0x8a, 0x72, 0xfb, 0x42, 0xcb, 0xb9,
0xed, 0x42, 0x88, 0x09, 0x53, 0x14, 0x4b, 0x92,
0x9c, 0x7f, 0x87, 0xc7, 0xe3, 0x69, 0x07, 0x72,
0xfc, 0x0f, 0xfd, 0x06, 0x79, 0xcd, 0x1b, 0x0c,
0xce, 0xbd, 0xad, 0x59, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
/* edit_find_replace.png - 1681 bytes */
static const unsigned char edit_find_replace_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x06,
0x1c, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x97, 0x5b, 0x48, 0x14, 0x5f, 0x1c, 0xc7, 0xbf,
0x73, 0x66, 0x6f, 0xee, 0x96, 0x9b, 0x79, 0x89,
0x2c, 0xf2, 0x92, 0xed, 0xa6, 0xa8, 0x50, 0x69,
0x14, 0xf4, 0x90, 0xa5, 0x50, 0xd8, 0x43, 0x42,
0x0f, 0x45, 0xd0, 0xed, 0x51, 0x34, 0x33, 0x23,
0x08, 0xa4, 0x42, 0x7c, 0xe8, 0xa2, 0x48, 0x51,
0x44, 0xbd, 0x14, 0x8a, 0x58, 0xd8, 0x15, 0x31,
0x0b, 0xba, 0x90, 0xd6, 0x4b, 0x4a, 0x98, 0xe8,
0xae, 0x25, 0xa9, 0x69, 0xdb, 0x65, 0xd5, 0xbd,
0x39, 0xeb, 0xde, 0x67, 0xfe, 0x0f, 0xd3, 0xf9,
0x8f, 0xbb, 0x36, 0xec, 0xf6, 0xff, 0x3f, 0xf4,
0xd2, 0xef, 0xe5, 0xc7, 0xcc, 0x99, 0x39, 0xe7,
0xf3, 0x3d, 0xbf, 0xcb, 0x9c, 0x01, 0xfe, 0xda,
0x9f, 0x35, 0x46, 0x6e, 0xe0, 0xda, 0xb5, 0xeb,
0xd7, 0xaf, 0x5e, 0xfd, 0xf8, 0xd1, 0xed, 0x76,
0xbb, 0x39, 0x2e, 0x2b, 0xcb, 0xef, 0xf7, 0xfb,
0xfd, 0x7e, 0x41, 0x08, 0x04, 0x02, 0x81, 0x50,
0x88, 0x10, 0xb9, 0xf7, 0x94, 0x4a, 0xa5, 0x92,
0x65, 0x79, 0x5e, 0xa5, 0x52, 0xa9, 0x54, 0x2a,
0x41, 0x88, 0x11, 0xe3, 0xa7, 0x75, 0x75, 0xd5,
0xd4, 0x54, 0x57, 0x9f, 0x3c, 0xb9, 0x6b, 0x57,
0xac, 0x02, 0x14, 0x72, 0x03, 0x2e, 0x97, 0xcb,
0xe5, 0x74, 0x66, 0x65, 0x6d, 0xdf, 0x5e, 0x54,
0x54, 0x52, 0xc2, 0x30, 0x9d, 0x9d, 0x5d, 0x5d,
0x9d, 0x9d, 0x0c, 0x93, 0x9f, 0xbf, 0x69, 0xd3,
0x8e, 0x1d, 0x80, 0xc7, 0xc3, 0x30, 0x5a, 0x2d,
0x10, 0x0c, 0xf2, 0x3c, 0x21, 0x80, 0x4a, 0x25,
0x08, 0x3e, 0x1f, 0xf0, 0xe1, 0xc3, 0xdb, 0xb7,
0x1d, 0x1d, 0x84, 0x94, 0x94, 0x14, 0x17, 0x17,
0x15, 0x01, 0x1b, 0x36, 0xac, 0x5f, 0x5f, 0x50,
0x10, 0x0d, 0x1d, 0x68, 0x6c, 0x6c, 0x6a, 0xba,
0x70, 0x61, 0xe7, 0xce, 0xdf, 0x8d, 0x80, 0xac,
0x00, 0xba, 0xe3, 0x14, 0xdc, 0x60, 0x28, 0x28,
0xd8, 0xb1, 0x03, 0x18, 0x19, 0x71, 0x3a, 0xe3,
0xe2, 0x80, 0x82, 0x02, 0x83, 0x21, 0x29, 0x09,
0x50, 0xab, 0x95, 0x4a, 0x85, 0x02, 0x30, 0x99,
0x26, 0x26, 0x6c, 0x36, 0x40, 0xaf, 0xcf, 0xc9,
0x29, 0x2d, 0x05, 0x1e, 0x3f, 0xee, 0xea, 0xea,
0xec, 0x04, 0x74, 0x3a, 0x9d, 0x4e, 0xa7, 0x03,
0x52, 0x53, 0x97, 0x2f, 0x4f, 0x4d, 0x5d, 0xb8,
0x4e, 0x7c, 0x7c, 0x7c, 0xbc, 0x5e, 0x4f, 0xaf,
0xa2, 0x45, 0x8c, 0x61, 0x22, 0x9f, 0x93, 0x4d,
0x05, 0x9e, 0xe7, 0x79, 0x80, 0x90, 0xcc, 0xcc,
0xdc, 0xdc, 0x2d, 0x5b, 0x80, 0xd1, 0x51, 0xa7,
0x53, 0xad, 0x06, 0xca, 0xca, 0x36, 0x6f, 0x4e,
0x4f, 0x07, 0xb2, 0xb3, 0x57, 0xae, 0x5c, 0xb2,
0x04, 0x48, 0x4b, 0x4b, 0x4e, 0xd6, 0x6a, 0x81,
0xbc, 0xbc, 0xb4, 0xb4, 0xa5, 0x4b, 0x81, 0x60,
0x90, 0x65, 0x75, 0x3a, 0x20, 0x25, 0x25, 0x2f,
0xaf, 0xb4, 0x14, 0x68, 0x6f, 0xbf, 0x7b, 0xb7,
0xbd, 0x7d, 0xe1, 0xfc, 0x82, 0x20, 0x08, 0xb1,
0x24, 0x58, 0x53, 0xd3, 0xbe, 0x7d, 0x84, 0x08,
0x82, 0xe8, 0x79, 0x3e, 0x72, 0x9c, 0x44, 0x9b,
0x40, 0x10, 0xe2, 0xe2, 0x92, 0x92, 0x80, 0xb4,
0xb4, 0x65, 0xcb, 0xe2, 0xe3, 0x01, 0xaf, 0xd7,
0xe7, 0xf3, 0xfb, 0x01, 0x97, 0x8b, 0xe3, 0xe6,
0xe6, 0x00, 0xb7, 0xdb, 0xe3, 0xf1, 0xfb, 0x81,
0x6f, 0xdf, 0xac, 0xd6, 0x99, 0x19, 0x80, 0x65,
0x83, 0x41, 0x8f, 0x07, 0xf8, 0xfa, 0xd5, 0xe5,
0x62, 0xe6, 0x55, 0x98, 0xd9, 0x6c, 0x36, 0x9b,
0xcd, 0x80, 0xc9, 0x64, 0x32, 0x99, 0x4c, 0xa2,
0x80, 0x58, 0xc0, 0x0f, 0x1e, 0xbc, 0x74, 0xe9,
0xf5, 0x6b, 0x60, 0xeb, 0xd6, 0x3d, 0x7b, 0xaa,
0xaa, 0xa4, 0xfb, 0x51, 0x53, 0x88, 0x9a, 0x5a,
0xad, 0x56, 0xab, 0x54, 0x80, 0xcf, 0x27, 0x2e,
0xe9, 0xf5, 0x06, 0x83, 0x82, 0x00, 0x10, 0x42,
0x08, 0xc3, 0x00, 0xb3, 0xb3, 0xa2, 0x00, 0xbd,
0x7e, 0xf1, 0x62, 0x9d, 0x0e, 0xc8, 0xca, 0x52,
0xa9, 0x34, 0x1a, 0xa0, 0xaf, 0x6f, 0x74, 0xd4,
0xe1, 0x90, 0xe6, 0x31, 0x1a, 0x8d, 0x46, 0xa3,
0x51, 0xda, 0x79, 0xb9, 0x08, 0x50, 0xc0, 0x43,
0x87, 0x2e, 0x5f, 0x7e, 0xf3, 0x06, 0x98, 0x9c,
0x7c, 0xf5, 0xaa, 0xa5, 0x05, 0x18, 0x18, 0x30,
0x9b, 0xa7, 0xa6, 0x42, 0x21, 0xf1, 0x29, 0x96,
0x8d, 0x59, 0x80, 0x20, 0xcc, 0xcd, 0xcd, 0xcc,
0x00, 0x16, 0x0b, 0xc7, 0xe9, 0x74, 0x80, 0xc7,
0xe3, 0x72, 0xd9, 0x6c, 0x80, 0x56, 0xab, 0x52,
0x89, 0xe3, 0x62, 0x58, 0x35, 0x1a, 0xa5, 0x92,
0xe7, 0x81, 0xc9, 0x49, 0xbb, 0x3d, 0x18, 0x04,
0x12, 0x13, 0x35, 0x1a, 0x8d, 0x06, 0xb0, 0xdb,
0xa5, 0x08, 0x0c, 0x0f, 0xd3, 0x39, 0x81, 0xec,
0xec, 0xec, 0xec, 0x9c, 0x1c, 0x69, 0x1d, 0x96,
0xed, 0xed, 0x3d, 0x75, 0x8a, 0x65, 0x17, 0x82,
0x8f, 0x8c, 0xcc, 0xcc, 0x00, 0x36, 0x9b, 0xc9,
0x74, 0xef, 0x1e, 0xcb, 0x56, 0x57, 0xb7, 0xb5,
0xf1, 0xbc, 0x14, 0x5b, 0x59, 0x01, 0x73, 0x73,
0x6e, 0xb7, 0xdb, 0x0d, 0x7c, 0xf8, 0xf0, 0xee,
0xdd, 0xf3, 0xe7, 0xc0, 0xaa, 0x55, 0x85, 0x85,
0x65, 0x65, 0x80, 0xcd, 0xe6, 0xf1, 0x28, 0x14,
0x80, 0x5e, 0xaf, 0xd1, 0xa8, 0x54, 0x00, 0xcb,
0x8a, 0x45, 0x6c, 0xb7, 0x3b, 0x9d, 0x1c, 0x07,
0xc4, 0xc5, 0xe9, 0x74, 0x84, 0x00, 0x53, 0x53,
0xfd, 0xfd, 0xf7, 0xef, 0x03, 0xdb, 0xb6, 0x15,
0x15, 0x6d, 0xdb, 0x06, 0xac, 0x5d, 0xbb, 0x76,
0xad, 0xd1, 0x28, 0x75, 0x1d, 0x1a, 0x81, 0x4b,
0x97, 0xf6, 0xef, 0x57, 0x28, 0x00, 0x9a, 0x2a,
0xe3, 0xe3, 0x2f, 0x5f, 0x36, 0x37, 0x03, 0x7d,
0x7d, 0x83, 0x83, 0xdf, 0xbf, 0x03, 0x1c, 0x37,
0x32, 0xf2, 0xe8, 0x11, 0x10, 0x09, 0x2e, 0x5b,
0x03, 0x15, 0x15, 0x47, 0x8f, 0x96, 0x97, 0x0f,
0x0f, 0xe7, 0xe6, 0xe6, 0xe6, 0xe6, 0xe7, 0x03,
0x99, 0x99, 0x19, 0x19, 0xab, 0x57, 0x03, 0x13,
0x13, 0xbd, 0xbd, 0x0f, 0x1e, 0x00, 0x06, 0xc3,
0xf2, 0xe5, 0x5a, 0x2d, 0x30, 0x36, 0x66, 0xb5,
0xce, 0xce, 0x02, 0xfd, 0xfd, 0xe3, 0xe3, 0x0e,
0x87, 0x58, 0xf4, 0x82, 0x20, 0x81, 0x27, 0x24,
0x24, 0x24, 0x24, 0x24, 0x00, 0x84, 0x30, 0x0c,
0xcb, 0x86, 0x83, 0x03, 0x40, 0x73, 0x73, 0x45,
0x45, 0x72, 0xf2, 0x7c, 0xf0, 0x67, 0xcf, 0x9a,
0x9b, 0x81, 0xfe, 0xfe, 0xe1, 0xe1, 0xa9, 0xa9,
0xe8, 0xe0, 0xd4, 0xfe, 0x1d, 0xa8, 0xaf, 0xaf,
0xaf, 0xaf, 0xab, 0x13, 0x84, 0xb4, 0xb4, 0xf4,
0xf4, 0x8c, 0x0c, 0xe9, 0x81, 0xe4, 0xe4, 0xa4,
0xa4, 0xa4, 0x24, 0x60, 0x68, 0xc8, 0x64, 0x1a,
0x1a, 0x02, 0x38, 0xce, 0xed, 0xe6, 0x38, 0xf9,
0x94, 0x33, 0x18, 0xd6, 0xac, 0x31, 0x18, 0x80,
0x92, 0x92, 0xe2, 0xe2, 0x92, 0x12, 0x09, 0x58,
0xa1, 0x50, 0x28, 0x14, 0x0a, 0xe0, 0xd6, 0xad,
0xf2, 0xf2, 0xc4, 0x44, 0xe0, 0xe0, 0xc1, 0xa6,
0x26, 0x11, 0xfc, 0xc5, 0x8b, 0xe6, 0x66, 0xc0,
0x64, 0xfa, 0xfc, 0xd9, 0x6e, 0x07, 0xa6, 0xa6,
0x06, 0x06, 0xda, 0xdb, 0xa3, 0x83, 0x47, 0x4d,
0xa1, 0x48, 0xf0, 0x23, 0x47, 0x0e, 0x1f, 0x3e,
0x72, 0x44, 0xec, 0x22, 0x66, 0x73, 0x64, 0x9d,
0x84, 0x77, 0x15, 0x41, 0x90, 0x72, 0x5e, 0xab,
0xd5, 0x6a, 0xb5, 0x5a, 0xa0, 0xbb, 0xbb, 0xa1,
0xa1, 0xb0, 0x50, 0x02, 0x1f, 0x1b, 0xeb, 0xe9,
0xb9, 0x73, 0x07, 0x18, 0x1a, 0x1a, 0x1b, 0xb3,
0xd9, 0x80, 0x99, 0x99, 0xc1, 0xc1, 0xbb, 0x77,
0x63, 0x07, 0x97, 0x15, 0x60, 0xb5, 0x5a, 0xad,
0x3f, 0x7e, 0x48, 0xfe, 0xd8, 0xb1, 0xaa, 0xaa,
0xea, 0x6a, 0xc0, 0xe9, 0x74, 0x3a, 0x1d, 0x0e,
0xb1, 0x9b, 0x18, 0x0c, 0x0b, 0x81, 0x23, 0xaf,
0x09, 0x21, 0x84, 0x65, 0x81, 0x96, 0x96, 0xca,
0xca, 0x94, 0x14, 0xe0, 0xc0, 0x81, 0xc6, 0xc6,
0x9e, 0x1e, 0xe0, 0xd3, 0xa7, 0xa7, 0x4f, 0x6f,
0xde, 0x04, 0xcc, 0xe6, 0x2f, 0x5f, 0x1c, 0x0e,
0x11, 0xfc, 0xde, 0x3d, 0xc0, 0xe3, 0x59, 0xb7,
0xae, 0xae, 0x0e, 0x00, 0xda, 0xda, 0x6a, 0x6b,
0x63, 0xc5, 0x9f, 0x57, 0x03, 0xb5, 0xb5, 0xb5,
0xb5, 0xa7, 0x4f, 0x33, 0x4c, 0x4d, 0xcd, 0xf1,
0xe3, 0x27, 0x4e, 0x30, 0x4c, 0x28, 0xc4, 0xf3,
0x81, 0x00, 0xcf, 0x13, 0x42, 0x08, 0x21, 0xe1,
0x6d, 0x8f, 0x61, 0xc4, 0x9c, 0xfe, 0xd5, 0x84,
0x4a, 0xa5, 0x52, 0xa9, 0x54, 0xce, 0x07, 0x6f,
0x68, 0xe8, 0xee, 0x06, 0x46, 0x46, 0x44, 0xf0,
0xc1, 0xc1, 0xf1, 0x71, 0xbb, 0x5d, 0x02, 0xaf,
0xaa, 0x6a, 0x6d, 0x0d, 0x06, 0x63, 0x07, 0x8e,
0x39, 0x85, 0x28, 0x30, 0xcf, 0x8b, 0xdf, 0xe4,
0xf9, 0xfd, 0xfb, 0x57, 0x3b, 0x4f, 0x8b, 0x94,
0x16, 0xf3, 0xd8, 0x18, 0xb0, 0x71, 0x23, 0xf0,
0xfe, 0x7d, 0x4f, 0x4f, 0x4f, 0x0f, 0x30, 0x31,
0x31, 0x39, 0x69, 0xb7, 0x8b, 0xed, 0xf0, 0xfe,
0x7d, 0xe0, 0xc0, 0x81, 0x2b, 0x57, 0xac, 0x56,
0x69, 0x7e, 0xea, 0x45, 0xa3, 0x7d, 0x9e, 0xf6,
0xfd, 0xff, 0x20, 0x80, 0x22, 0x86, 0x42, 0xa1,
0x50, 0x28, 0x24, 0x2f, 0x80, 0x61, 0x18, 0x86,
0x10, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0xe0,
0xc6, 0x8d, 0xf2, 0xf2, 0x15, 0x2b, 0x80, 0xc1,
0xc1, 0x1f, 0x3f, 0xd2, 0xd3, 0x01, 0x87, 0xa3,
0xb5, 0xf5, 0xf6, 0x6d, 0x20, 0x33, 0x93, 0x90,
0x81, 0x01, 0x60, 0xef, 0xde, 0xf3, 0xe7, 0xcd,
0x66, 0x31, 0x25, 0x9d, 0x4e, 0x80, 0x65, 0x59,
0x96, 0x65, 0x81, 0x40, 0xc0, 0xef, 0x0f, 0x04,
0xe8, 0xcc, 0xf4, 0x74, 0xe4, 0x72, 0x85, 0x0b,
0x59, 0xf8, 0xe9, 0x8b, 0xfa, 0x21, 0x9b, 0x2f,
0x60, 0x7e, 0x64, 0x94, 0x4a, 0xb1, 0xff, 0x53,
0x01, 0x1c, 0xc7, 0x71, 0x1c, 0x07, 0x9c, 0x3d,
0xfb, 0xf0, 0xa1, 0x20, 0x00, 0x95, 0x95, 0xc5,
0xc5, 0xe3, 0xe3, 0xc0, 0xae, 0x5d, 0x15, 0x15,
0x4f, 0x9e, 0x48, 0xa9, 0x35, 0x3d, 0x3d, 0x3d,
0x3d, 0x3d, 0x0d, 0x88, 0xc7, 0x6d, 0xb1, 0x56,
0x08, 0x01, 0x7c, 0x3e, 0x9f, 0xcf, 0xe7, 0xa3,
0xab, 0x26, 0x26, 0x8a, 0x9e, 0xde, 0xf1, 0x78,
0x7e, 0x53, 0x80, 0x94, 0xdf, 0x6a, 0xb5, 0x5a,
0xad, 0x56, 0x4b, 0x5e, 0x2e, 0xd5, 0x28, 0x90,
0xc5, 0x62, 0xb1, 0x58, 0x2c, 0x80, 0xd7, 0xeb,
0xf5, 0x7a, 0xbd, 0x12, 0x20, 0xf5, 0xb4, 0x9d,
0xd2, 0x9d, 0xa7, 0x9e, 0xbe, 0x1f, 0x0e, 0x4c,
0xab, 0x43, 0xfe, 0xdc, 0x24, 0x23, 0x40, 0x10,
0xc4, 0x89, 0x3b, 0x3a, 0x2e, 0x5e, 0x6c, 0x6c,
0x3c, 0x77, 0x6e, 0xf7, 0xee, 0x48, 0x60, 0x39,
0x21, 0x52, 0xed, 0x88, 0x87, 0x0c, 0x9e, 0x17,
0xef, 0xd0, 0x5f, 0x16, 0x69, 0x8b, 0xc2, 0xdb,
0x40, 0x5d, 0xdd, 0x99, 0x33, 0xf5, 0xf5, 0xf4,
0x70, 0x41, 0x4f, 0x51, 0x34, 0xa9, 0xe4, 0x05,
0xc4, 0xd8, 0x6f, 0x15, 0x3f, 0x85, 0xea, 0x74,
0xa2, 0x5f, 0xbc, 0x38, 0xdc, 0x2f, 0x5a, 0x14,
0x3e, 0x4e, 0xff, 0xd8, 0x68, 0x31, 0x52, 0x00,
0x0a, 0x44, 0x77, 0x98, 0x9e, 0x94, 0x68, 0xae,
0xbb, 0xdd, 0xe1, 0xe3, 0xb4, 0xac, 0xff, 0xb7,
0x00, 0x69, 0xdf, 0xc2, 0xc1, 0xe8, 0x35, 0x15,
0x18, 0x39, 0x4e, 0x85, 0x50, 0x80, 0x48, 0x21,
0x34, 0x45, 0xe4, 0x40, 0x63, 0xfd, 0x25, 0xfd,
0x6b, 0x7f, 0xce, 0xfe, 0x01, 0xc9, 0xa7, 0x95,
0x94, 0xde, 0x64, 0xc1, 0x5d, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82};

229
art/tango/edit_paste.h Normal file
View File

@@ -0,0 +1,229 @@
/* edit_paste.png - 561 bytes */
static const unsigned char edit_paste_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59,
0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b,
0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00,
0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xd5,
0x0a, 0x0e, 0x00, 0x1c, 0x15, 0xaf, 0xe2, 0xf1,
0x18, 0x00, 0x00, 0x01, 0xd0, 0x49, 0x44, 0x41,
0x54, 0x38, 0xcb, 0x95, 0x93, 0xb1, 0x6b, 0x53,
0x51, 0x14, 0xc6, 0x7f, 0xf7, 0xbd, 0x34, 0x82,
0x24, 0x31, 0x8d, 0xd4, 0x94, 0x0c, 0x85, 0x22,
0x06, 0x5c, 0x5c, 0xb4, 0x6a, 0x62, 0x04, 0xd1,
0x12, 0x70, 0x76, 0xd0, 0x21, 0x38, 0x14, 0x45,
0x6d, 0x1d, 0xc4, 0xc5, 0x41, 0x97, 0x82, 0x38,
0x08, 0x8e, 0xfa, 0x0f, 0x34, 0x83, 0xbb, 0x9b,
0xa8, 0x4b, 0xd5, 0x2e, 0xba, 0x38, 0x29, 0x91,
0x52, 0xa8, 0xd1, 0x48, 0x42, 0x5e, 0x6f, 0x6c,
0xd0, 0x46, 0xef, 0x39, 0x0e, 0xa1, 0x31, 0x2f,
0x6d, 0x20, 0x7e, 0xdb, 0xfd, 0xce, 0x3d, 0x3f,
0xce, 0xf9, 0xe0, 0x18, 0x06, 0x54, 0x2a, 0x95,
0x8c, 0xef, 0x7b, 0xcf, 0x9d, 0x93, 0xd9, 0x7e,
0xdf, 0xf7, 0xbd, 0x17, 0xce, 0x49, 0xb1, 0x5c,
0x2e, 0x6b, 0xbf, 0x6f, 0x00, 0x6e, 0xce, 0x9a,
0x2b, 0x06, 0x1e, 0x2a, 0x8c, 0x2b, 0x1e, 0x76,
0xf2, 0x12, 0xb9, 0xdc, 0x11, 0x3c, 0xcf, 0x00,
0x20, 0xa2, 0xac, 0xac, 0x7c, 0x60, 0x5f, 0xed,
0x29, 0x06, 0x01, 0x68, 0xaa, 0xea, 0xad, 0xc7,
0x2f, 0x59, 0x32, 0xf3, 0x67, 0x89, 0xf8, 0x9e,
0x09, 0x2e, 0x9c, 0x39, 0x18, 0xfb, 0xd2, 0xc9,
0xf0, 0x2e, 0xc8, 0xd2, 0xb4, 0x1d, 0xa6, 0xa7,
0xa7, 0x30, 0x66, 0x1b, 0x20, 0xac, 0xad, 0xad,
0x93, 0x4c, 0x44, 0x39, 0x9a, 0xfc, 0xcc, 0xa4,
0xbf, 0xce, 0xb3, 0xd7, 0xab, 0x56, 0x54, 0x53,
0x11, 0x20, 0xe6, 0x79, 0x66, 0x2c, 0x1a, 0xf1,
0x79, 0x5f, 0xcf, 0xb2, 0x78, 0xff, 0x11, 0x41,
0x10, 0x50, 0xa9, 0x54, 0x42, 0xab, 0xcd, 0xcd,
0x1d, 0x22, 0x95, 0x4a, 0x71, 0xef, 0xee, 0x6d,
0x2e, 0x66, 0xbe, 0x21, 0xaa, 0x31, 0x20, 0x1a,
0xe9, 0xff, 0xd4, 0xde, 0x82, 0x44, 0x22, 0x81,
0xaa, 0x30, 0x33, 0x73, 0x6c, 0x30, 0x1e, 0xe2,
0xf1, 0x38, 0x5b, 0x7f, 0xc0, 0xa9, 0xe9, 0x79,
0x3d, 0x80, 0x6a, 0x28, 0x1b, 0x96, 0xdf, 0xbc,
0x0d, 0xbd, 0x0b, 0xf9, 0x1c, 0xbb, 0x29, 0xc2,
0x10, 0x9d, 0x3e, 0x95, 0xe7, 0x1f, 0x5c, 0x10,
0x71, 0xc3, 0x01, 0xba, 0x4b, 0x61, 0x7b, 0x02,
0x55, 0x45, 0x45, 0xc8, 0x9d, 0x3c, 0xfe, 0x7f,
0x13, 0x14, 0xf2, 0x39, 0x44, 0x04, 0x11, 0x41,
0x55, 0xb0, 0xd6, 0x32, 0x31, 0x91, 0x1e, 0x0d,
0xd0, 0xdf, 0x28, 0xd2, 0x6d, 0x6e, 0xfd, 0x68,
0x8d, 0x3e, 0x81, 0x88, 0xeb, 0x41, 0xaa, 0x5f,
0xab, 0x34, 0x1a, 0xf5, 0x1d, 0x21, 0x87, 0x01,
0x03, 0x35, 0xe7, 0xba, 0x80, 0x56, 0xcb, 0xd2,
0xa8, 0xd7, 0x29, 0x16, 0xcf, 0x0f, 0xdb, 0x14,
0x6f, 0xd8, 0x04, 0xd6, 0x6e, 0x50, 0xfb, 0x5e,
0x43, 0x44, 0x7a, 0xfe, 0xf5, 0xf9, 0xab, 0x5c,
0x9e, 0x5a, 0x1e, 0xbe, 0xc2, 0xde, 0x31, 0xa5,
0x19, 0x34, 0x49, 0xa7, 0x33, 0xa4, 0xd3, 0x19,
0xb2, 0xd9, 0xc3, 0x58, 0xbb, 0x81, 0xaa, 0x70,
0x63, 0xe1, 0x5a, 0xaf, 0xd9, 0x37, 0x1a, 0x02,
0x6c, 0x8a, 0xe8, 0xef, 0xf6, 0x2f, 0xb7, 0xe7,
0x44, 0xf2, 0x23, 0x0f, 0x16, 0xef, 0xf0, 0xd3,
0xed, 0x8c, 0xa6, 0xb0, 0xff, 0x13, 0xab, 0xed,
0x03, 0x00, 0x24, 0xb5, 0x8a, 0x31, 0x66, 0x53,
0x55, 0x3b, 0x06, 0x60, 0xe1, 0x5c, 0xf7, 0x1a,
0x31, 0x8c, 0x33, 0x82, 0x54, 0xbb, 0xd7, 0xf8,
0xe4, 0x15, 0x4b, 0x7f, 0x01, 0x4f, 0xe6, 0xe1,
0x98, 0x78, 0x69, 0xc4, 0xda, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82};
/* edit_paste.png - 1209 bytes */
static const unsigned char edit_paste_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
0x44, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5,
0x57, 0x4d, 0x68, 0x53, 0x4b, 0x14, 0xfe, 0xee,
0xcd, 0x4d, 0x34, 0xda, 0x34, 0x7f, 0xe6, 0xa7,
0x86, 0x80, 0x10, 0x68, 0xb1, 0x3b, 0xa9, 0x5d,
0x74, 0x23, 0x51, 0x4c, 0x4a, 0x70, 0x61, 0x8d,
0x6e, 0x84, 0xb8, 0xeb, 0x4e, 0xec, 0xd6, 0xb8,
0x10, 0x8a, 0x86, 0xe2, 0xc6, 0xb8, 0x10, 0x05,
0x69, 0x05, 0xc1, 0x80, 0x5b, 0xdd, 0x24, 0x3b,
0xcd, 0x42, 0x83, 0x60, 0xb3, 0x28, 0x42, 0x41,
0x41, 0x90, 0x5a, 0x69, 0xfe, 0xcc, 0xcf, 0xcd,
0x4d, 0x62, 0xd2, 0x64, 0xc6, 0xc5, 0x70, 0xb1,
0x49, 0xee, 0x7d, 0x4d, 0x7c, 0x6d, 0x9f, 0xef,
0x6c, 0x0e, 0x33, 0x73, 0xe6, 0xcc, 0xf9, 0xce,
0x77, 0xce, 0xdc, 0xb9, 0xc0, 0xff, 0x5c, 0xb8,
0xbd, 0x72, 0x14, 0x0a, 0x85, 0x42, 0xa1, 0xd0,
0x9b, 0x37, 0x6c, 0xe4, 0xf5, 0xfe, 0xb3, 0x75,
0x32, 0x19, 0x8b, 0xc5, 0x62, 0xb1, 0xd8, 0xd9,
0xb3, 0xfb, 0x0e, 0x60, 0x71, 0x71, 0x71, 0x11,
0xe0, 0xf9, 0xaf, 0x5f, 0x93, 0x49, 0x40, 0xa7,
0x93, 0xe7, 0x5b, 0x2d, 0x87, 0xe3, 0xe2, 0xc5,
0x53, 0xa7, 0x04, 0xe1, 0xd0, 0xa1, 0xd1, 0xd1,
0x57, 0xaf, 0x08, 0x21, 0x84, 0x52, 0x9b, 0x6d,
0x6a, 0x6a, 0x6a, 0x6a, 0x62, 0x02, 0xe0, 0x38,
0x8e, 0xe3, 0x76, 0x78, 0xa7, 0x94, 0x52, 0x4a,
0x81, 0x74, 0x3a, 0x9d, 0xfe, 0xf4, 0x09, 0xe0,
0x79, 0x9e, 0xe7, 0xb8, 0x7c, 0xbe, 0xdd, 0x6e,
0x36, 0xab, 0xd5, 0x60, 0x50, 0xa7, 0xcb, 0x66,
0x5f, 0xbe, 0x5c, 0x5d, 0x95, 0xed, 0x4f, 0x9c,
0xf0, 0x7a, 0x81, 0x56, 0x8b, 0x9d, 0x4f, 0xc8,
0xd0, 0x00, 0x16, 0x16, 0x7c, 0x3e, 0x8d, 0xe6,
0xda, 0x35, 0x4a, 0x01, 0x42, 0x1e, 0x3e, 0x24,
0x84, 0x10, 0x60, 0x64, 0x44, 0x5e, 0xff, 0xf9,
0xd3, 0x6c, 0x9e, 0x99, 0xe1, 0x79, 0x87, 0x63,
0x7c, 0x7c, 0x66, 0x86, 0xe3, 0xdc, 0x6e, 0xb7,
0xdb, 0xe1, 0x18, 0x3c, 0x73, 0x9b, 0x9b, 0x9b,
0x9b, 0xf9, 0x3c, 0x90, 0xc9, 0x7c, 0xfe, 0x9c,
0x4a, 0x51, 0x7a, 0xf8, 0x70, 0xb1, 0x98, 0x4a,
0x11, 0x42, 0x29, 0x5b, 0xe7, 0x79, 0x8e, 0x03,
0x24, 0x89, 0x52, 0x42, 0x78, 0xfe, 0xc6, 0x8d,
0x47, 0x8f, 0x5e, 0xbf, 0xee, 0x74, 0x9e, 0x3f,
0xef, 0xf5, 0x23, 0xa8, 0x65, 0xbc, 0x54, 0x7a,
0xf7, 0x8e, 0x90, 0x07, 0x0f, 0x82, 0xc1, 0x33,
0x67, 0x3c, 0x1e, 0xa3, 0x31, 0x9b, 0xdd, 0xde,
0xb6, 0xdb, 0x81, 0x0f, 0x1f, 0x44, 0x71, 0x72,
0x12, 0x68, 0x34, 0x44, 0xb1, 0xd3, 0x01, 0xac,
0x56, 0xab, 0xd5, 0x66, 0x03, 0x3c, 0x1e, 0x8f,
0x67, 0x7c, 0xbc, 0x27, 0x3b, 0x1c, 0x63, 0x42,
0x69, 0xdc, 0x6c, 0x36, 0x9b, 0x00, 0x90, 0xc9,
0x64, 0x32, 0x13, 0x13, 0x1c, 0xa7, 0xd7, 0xbb,
0x5c, 0x27, 0x4f, 0x6a, 0x34, 0xd3, 0xd3, 0xa3,
0xa3, 0xeb, 0xeb, 0x80, 0xd1, 0x08, 0x64, 0xb3,
0x46, 0x63, 0x3c, 0x9e, 0x4a, 0x7d, 0xf9, 0x12,
0x8d, 0x32, 0x0f, 0x03, 0x00, 0x90, 0x4b, 0xc5,
0x60, 0x10, 0x04, 0xc0, 0x64, 0xd2, 0x6a, 0xb5,
0x5a, 0x9e, 0x07, 0x56, 0x57, 0x8b, 0xc5, 0xc9,
0x49, 0x20, 0x1c, 0xbe, 0x7d, 0xfb, 0xde, 0x3d,
0xa0, 0x52, 0x29, 0x97, 0x2b, 0x15, 0x20, 0x1a,
0x8d, 0x46, 0xef, 0xdf, 0x07, 0xd6, 0xd6, 0xd6,
0xd6, 0xd6, 0xd7, 0x07, 0x67, 0xc0, 0x60, 0x30,
0x18, 0x46, 0x46, 0x80, 0x70, 0x38, 0x1c, 0xbe,
0x75, 0x0b, 0x30, 0x9b, 0x2d, 0x16, 0xb3, 0x19,
0x58, 0x5a, 0xba, 0x73, 0xe7, 0xe6, 0x4d, 0x20,
0x18, 0x74, 0x3a, 0x0b, 0x05, 0x80, 0x10, 0x4a,
0x39, 0xee, 0xd8, 0x31, 0x56, 0x86, 0xfd, 0x7e,
0x84, 0xdd, 0x0e, 0xe2, 0x38, 0x4a, 0x19, 0x99,
0x2c, 0x63, 0x56, 0xab, 0xc5, 0x62, 0xb5, 0x02,
0x82, 0xa0, 0xd1, 0x68, 0x34, 0x40, 0x24, 0x12,
0x89, 0x44, 0x22, 0x40, 0xbb, 0xdd, 0x6e, 0xb7,
0xdb, 0x83, 0x03, 0x10, 0x04, 0x41, 0x10, 0x84,
0xdf, 0xbd, 0x62, 0x34, 0x1a, 0x8d, 0x26, 0x13,
0x50, 0xaf, 0xb7, 0x5a, 0x8c, 0xa9, 0x01, 0xfd,
0x0c, 0x7e, 0xa4, 0x1a, 0x40, 0x16, 0x80, 0x56,
0xab, 0xd5, 0x6a, 0xb5, 0xc3, 0xef, 0x97, 0x9b,
0x5b, 0x69, 0x65, 0x4f, 0x01, 0xa8, 0xb9, 0x4b,
0x24, 0x12, 0x89, 0x44, 0xe2, 0xcf, 0x02, 0x07,
0x80, 0xd9, 0xd9, 0xd9, 0x59, 0xbf, 0x7f, 0xf8,
0xfd, 0x43, 0x03, 0x50, 0x93, 0x40, 0x20, 0x10,
0x08, 0x04, 0x06, 0x0b, 0x98, 0xd2, 0x6e, 0x4d,
0x08, 0x40, 0x08, 0xbb, 0xdf, 0x0e, 0x00, 0x80,
0x32, 0x07, 0xbb, 0x31, 0xa0, 0x14, 0xb8, 0xec,
0x89, 0x52, 0xc0, 0xe7, 0xf3, 0xf9, 0x7c, 0xbe,
0x03, 0x01, 0xa0, 0x2c, 0xbd, 0x0c, 0x28, 0x65,
0x78, 0xe7, 0xb8, 0x17, 0x88, 0x28, 0x8a, 0x62,
0xa5, 0x02, 0xd8, 0xed, 0x76, 0xbb, 0xd3, 0xb9,
0x0f, 0x00, 0x76, 0x6b, 0xa5, 0x78, 0x3c, 0x1e,
0x97, 0x19, 0x50, 0xca, 0xb4, 0x1c, 0xb8, 0xdf,
0xef, 0xf7, 0xfb, 0xfd, 0xfd, 0xf3, 0xa2, 0x58,
0xad, 0x8a, 0xe2, 0xf0, 0xe7, 0x0e, 0xc5, 0x80,
0x92, 0x33, 0xb9, 0x76, 0xe5, 0x26, 0x54, 0xcb,
0xb0, 0x6c, 0x27, 0xeb, 0x5e, 0xbb, 0x7c, 0x3e,
0x97, 0xcb, 0xe7, 0x87, 0xcf, 0xfc, 0x50, 0x00,
0x94, 0x44, 0x2d, 0x20, 0xb5, 0x12, 0xda, 0xda,
0xda, 0xda, 0xfa, 0xfe, 0x1d, 0x90, 0x24, 0x49,
0xaa, 0xd5, 0x80, 0x7a, 0xbd, 0x5e, 0xaf, 0xd7,
0x7f, 0xdb, 0xfd, 0x55, 0x00, 0x76, 0x8e, 0x65,
0x00, 0x1b, 0x1b, 0x1b, 0x1b, 0xdf, 0xbe, 0x01,
0x73, 0x73, 0x73, 0x73, 0x97, 0x2f, 0xf7, 0xfb,
0xab, 0x54, 0x2a, 0x95, 0x72, 0xf9, 0x80, 0x01,
0x74, 0x3a, 0xea, 0x81, 0xf7, 0x97, 0x50, 0x77,
0xa6, 0xe5, 0x80, 0x45, 0x51, 0x14, 0x45, 0x91,
0x31, 0x53, 0xad, 0xfe, 0x47, 0x0c, 0x28, 0x35,
0x65, 0xad, 0x26, 0x49, 0x92, 0x04, 0xe4, 0x72,
0xb9, 0x5c, 0x2e, 0x07, 0x50, 0xda, 0x7d, 0xdf,
0xcb, 0x81, 0x67, 0xb3, 0xd9, 0x6c, 0x26, 0x03,
0x2c, 0x2f, 0x3f, 0x7d, 0xba, 0xbc, 0x0c, 0x5c,
0xb8, 0xe0, 0x74, 0xa6, 0xd3, 0x7b, 0x00, 0xa0,
0xb7, 0x71, 0x8f, 0x1e, 0xd5, 0xe9, 0x08, 0x01,
0xf2, 0xf9, 0x42, 0x21, 0x9f, 0x07, 0xc6, 0xc6,
0xc6, 0xc6, 0x5c, 0xae, 0xfe, 0x7d, 0x4a, 0x73,
0x3b, 0x45, 0xce, 0xbc, 0x5a, 0xe0, 0x56, 0xab,
0x4e, 0x57, 0xab, 0xed, 0x03, 0x03, 0x6e, 0x37,
0x21, 0x1f, 0x3f, 0x02, 0x4b, 0x4b, 0x77, 0xef,
0x86, 0xc3, 0xec, 0xd1, 0xc5, 0xf3, 0x7f, 0x44,
0x5e, 0x97, 0x5c, 0xb9, 0xe2, 0x72, 0xbd, 0x7f,
0x0f, 0x1c, 0x39, 0xa2, 0xd1, 0xb4, 0x5a, 0xc3,
0xef, 0xef, 0x03, 0xf0, 0xec, 0x59, 0x32, 0x09,
0x34, 0x9b, 0x0b, 0x0b, 0xe7, 0xcf, 0x03, 0xc5,
0xa2, 0x24, 0x35, 0x1a, 0xed, 0xb6, 0xcd, 0x76,
0xfa, 0xf4, 0xf1, 0xe3, 0x95, 0x0a, 0x30, 0x3d,
0x4d, 0xe9, 0xdb, 0xb7, 0xea, 0x0e, 0x07, 0xbd,
0xbf, 0xd5, 0x85, 0xbd, 0x43, 0xcb, 0x65, 0x49,
0x92, 0x5f, 0xb7, 0x94, 0xe6, 0x72, 0xaa, 0xd6,
0x6a, 0x0b, 0xd7, 0xaf, 0x9f, 0x3b, 0x07, 0x5c,
0xba, 0xc4, 0x71, 0x3c, 0xcf, 0xf3, 0x8f, 0x1f,
0xb3, 0x2a, 0xb7, 0xd9, 0x94, 0x0e, 0x53, 0x0b,
0x62, 0x70, 0xe9, 0x87, 0x4d, 0x29, 0xc0, 0x71,
0xa5, 0x12, 0x21, 0x7a, 0xbd, 0xc3, 0x11, 0x89,
0x6c, 0x6f, 0x3b, 0x9d, 0x5e, 0xef, 0x93, 0x27,
0x2b, 0x2b, 0x2b, 0x2b, 0x2f, 0x5e, 0x34, 0x1a,
0xbb, 0x02, 0xe8, 0x95, 0xf9, 0xf9, 0xf9, 0xf9,
0xab, 0x57, 0xf5, 0x7a, 0x36, 0x32, 0x99, 0x98,
0xb6, 0x58, 0x98, 0x66, 0x3f, 0x1c, 0x80, 0x0c,
0xd0, 0x6e, 0xef, 0x9e, 0x37, 0x18, 0x98, 0xae,
0xd7, 0x99, 0x2e, 0x95, 0x98, 0x2e, 0x14, 0x98,
0x96, 0x3f, 0x65, 0x3f, 0x7e, 0x30, 0x5d, 0x2c,
0x76, 0x8f, 0xab, 0x55, 0x16, 0xf8, 0xbf, 0xf9,
0x62, 0xfc, 0xa5, 0xf2, 0x0b, 0xaf, 0xc4, 0x0e,
0xdb, 0x06, 0x1b, 0x53, 0xf5, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82};

235
art/tango/edit_redo.h Normal file
View File

@@ -0,0 +1,235 @@
/* edit_redo.png - 591 bytes */
static const unsigned char edit_redo_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd6, 0x07, 0x1a, 0x0a, 0x27, 0x15, 0x3f,
0xb8, 0xed, 0x21, 0x00, 0x00, 0x01, 0xdc, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x9d, 0x93, 0x4d,
0x6b, 0x13, 0x51, 0x18, 0x85, 0x9f, 0x3b, 0x5f,
0x4d, 0x8c, 0xa4, 0x42, 0x4c, 0x63, 0x83, 0x1f,
0x6d, 0x36, 0xd5, 0x76, 0xd3, 0xd2, 0x2a, 0x7e,
0x54, 0x63, 0x0d, 0x42, 0xa9, 0x38, 0x6e, 0x44,
0x2b, 0x82, 0xb8, 0x1a, 0x70, 0xad, 0x3b, 0xc1,
0xbf, 0xe0, 0x7e, 0x56, 0xdd, 0x75, 0x29, 0x44,
0x0a, 0x85, 0x8a, 0xc5, 0x52, 0xba, 0x6a, 0xa4,
0xa8, 0x1b, 0xc1, 0x4d, 0x75, 0x21, 0x29, 0x62,
0x4c, 0x26, 0x4d, 0x9a, 0xc9, 0x64, 0xc6, 0xcd,
0x18, 0x27, 0x9d, 0x41, 0x82, 0x67, 0xf9, 0x5e,
0x9e, 0xc3, 0xb9, 0xe7, 0xbe, 0x17, 0xfa, 0x90,
0x6e, 0x6a, 0x9e, 0x6e, 0x6a, 0xd3, 0x51, 0x67,
0x12, 0xfd, 0x6b, 0x5b, 0x37, 0xb5, 0xc2, 0x7f,
0x1b, 0x3c, 0x7e, 0x60, 0x00, 0xbc, 0xd1, 0x4d,
0x6d, 0x2e, 0x38, 0x17, 0x11, 0x71, 0x07, 0x80,
0x3c, 0xb0, 0x08, 0x4c, 0x01, 0x93, 0x01, 0x03,
0x96, 0x96, 0x4d, 0x80, 0x1b, 0x45, 0xc3, 0x5e,
0x0f, 0x19, 0xe8, 0xa6, 0x76, 0x01, 0x78, 0x3e,
0x27, 0xb4, 0x54, 0xb6, 0x70, 0x75, 0x58, 0x4d,
0x8d, 0xe6, 0x10, 0x02, 0x55, 0x8e, 0x61, 0xd9,
0x3f, 0x29, 0x7d, 0x5b, 0xe1, 0xca, 0xe8, 0xbd,
0x1e, 0x13, 0x11, 0x80, 0x17, 0x80, 0x17, 0x8f,
0xf2, 0xf9, 0xf3, 0xf2, 0x50, 0x4e, 0xaa, 0xd9,
0x65, 0xbc, 0xda, 0xa7, 0x9e, 0x74, 0x1f, 0x9b,
0x35, 0x80, 0xae, 0xc9, 0xb9, 0x3d, 0x7b, 0x56,
0xf8, 0xf0, 0x04, 0xf0, 0xf2, 0xe1, 0xb5, 0xeb,
0x37, 0x63, 0x99, 0x33, 0x58, 0x95, 0x75, 0x2c,
0x4f, 0x23, 0xee, 0xda, 0x00, 0x0c, 0x3a, 0x0d,
0x36, 0xdb, 0xce, 0xdf, 0xe2, 0x84, 0xc4, 0xa5,
0x91, 0xbb, 0x2c, 0x2d, 0x9b, 0x28, 0xfe, 0xec,
0xe9, 0x9d, 0xb3, 0xe3, 0x93, 0xb1, 0x74, 0x96,
0xfa, 0xaf, 0x77, 0x24, 0x5a, 0x0d, 0x12, 0x34,
0x18, 0x6e, 0x55, 0x78, 0x45, 0x02, 0x47, 0xea,
0xed, 0x3a, 0x3d, 0x78, 0xb2, 0x7b, 0x0d, 0x05,
0x60, 0x40, 0xd5, 0x66, 0x8f, 0x8f, 0x4d, 0xa7,
0xe3, 0xd6, 0x7b, 0xb2, 0xfb, 0x55, 0x76, 0xa4,
0x04, 0x9a, 0x22, 0xa8, 0x1d, 0x89, 0x33, 0xee,
0x43, 0x17, 0x15, 0x30, 0xeb, 0x16, 0x99, 0x63,
0xa7, 0xd9, 0x5c, 0xfd, 0xd0, 0xed, 0x40, 0x01,
0xe8, 0xb8, 0x6e, 0x46, 0xc8, 0x82, 0x54, 0xc3,
0x62, 0xab, 0x54, 0xf7, 0xd6, 0x5a, 0x95, 0xd0,
0xeb, 0x4c, 0x5c, 0x3e, 0x11, 0x82, 0xbb, 0x7b,
0xe0, 0x74, 0x9c, 0xe4, 0xd1, 0xc6, 0x57, 0xb6,
0x77, 0x76, 0x59, 0x6b, 0xb5, 0x2d, 0xe0, 0x19,
0x30, 0x55, 0x34, 0x6c, 0x51, 0x34, 0x6c, 0x01,
0xf0, 0x36, 0x39, 0x14, 0x82, 0x81, 0x6e, 0x07,
0xec, 0x37, 0xab, 0xee, 0x4a, 0x5d, 0x48, 0xc0,
0xfd, 0xa2, 0x61, 0xaf, 0x1e, 0x4e, 0xe0, 0xc3,
0x33, 0x45, 0xc3, 0x2e, 0x45, 0x6e, 0xa2, 0xaa,
0xc8, 0x07, 0x80, 0x17, 0x05, 0xfb, 0x0a, 0xc1,
0xc1, 0x04, 0x1b, 0xcd, 0xbd, 0xb2, 0x5a, 0x90,
0xbd, 0x18, 0xa6, 0x36, 0x7f, 0xd8, 0xe4, 0xcf,
0x35, 0xa2, 0x24, 0x03, 0x8c, 0xdd, 0x96, 0xdd,
0x2f, 0x07, 0xed, 0xfa, 0xad, 0x99, 0xdc, 0x8f,
0xd4, 0x6e, 0xf9, 0x94, 0xd0, 0xd5, 0xad, 0xcf,
0xaf, 0x3b, 0x76, 0x3f, 0x7f, 0x24, 0xb8, 0x89,
0x23, 0xc0, 0x02, 0x50, 0x05, 0x36, 0x9e, 0x24,
0xdd, 0xef, 0x02, 0xbc, 0xf9, 0x45, 0xa7, 0xf3,
0x2f, 0x83, 0xdf, 0xd7, 0x4b, 0xba, 0x05, 0x5e,
0xcf, 0x35, 0xde, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
/* edit_redo.png - 1234 bytes */
static const unsigned char edit_redo_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
0x5d, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x96, 0x4d, 0x6b, 0x13, 0x5d, 0x14, 0xc7, 0xcf,
0xbd, 0x33, 0x93, 0x69, 0x4c, 0x6d, 0x8d, 0x69,
0xe3, 0x18, 0x2b, 0x36, 0x8a, 0x88, 0x52, 0x2d,
0x58, 0x15, 0x0a, 0x62, 0xa5, 0xa2, 0x34, 0x55,
0xba, 0x10, 0x44, 0x04, 0x57, 0x22, 0x7e, 0x06,
0x97, 0x7e, 0x01, 0x17, 0xea, 0xae, 0x1b, 0x17,
0xfa, 0x09, 0x5c, 0xf8, 0x52, 0x10, 0x14, 0x14,
0x71, 0x51, 0x6c, 0xbb, 0x10, 0x4b, 0x4d, 0xb0,
0x96, 0xa4, 0x79, 0xc1, 0x4c, 0x9a, 0x97, 0x49,
0x66, 0x32, 0xf7, 0x9e, 0x67, 0x71, 0xb9, 0x84,
0x4e, 0x33, 0x4f, 0x9b, 0xd6, 0x07, 0x11, 0x9e,
0xb3, 0x39, 0x9c, 0x70, 0xce, 0x9d, 0xdf, 0xff,
0x9c, 0x33, 0x37, 0x03, 0xf0, 0xbf, 0x6d, 0xcd,
0xa6, 0xa6, 0xa6, 0xa7, 0x03, 0x01, 0x44, 0xe1,
0x77, 0xef, 0xfe, 0x5d, 0xe7, 0xd2, 0x3f, 0x23,
0xa7, 0x5c, 0x16, 0x42, 0xc2, 0xe1, 0xbf, 0x4e,
0xc0, 0xf9, 0xf3, 0x13, 0x13, 0xa7, 0x4e, 0xc9,
0xa8, 0x58, 0xdc, 0xa9, 0x90, 0x3f, 0x34, 0x81,
0xdf, 0x27, 0x84, 0xec, 0x14, 0x44, 0x3c, 0x38,
0x14, 0x12, 0xd1, 0x9d, 0x3b, 0xc2, 0x3f, 0x7e,
0xbc, 0x19, 0x78, 0xb9, 0xdc, 0x6c, 0xe6, 0xf3,
0x00, 0x3d, 0x3d, 0x9a, 0x16, 0x8d, 0x02, 0x7c,
0xf8, 0xf0, 0xfa, 0xf5, 0xc2, 0x82, 0xcc, 0xda,
0xbb, 0xf7, 0xc5, 0x8b, 0x7b, 0xf7, 0x1c, 0xc7,
0x34, 0xff, 0x33, 0x01, 0x02, 0x3c, 0x91, 0x10,
0xd1, 0xcb, 0x97, 0x89, 0x44, 0x20, 0x10, 0x8b,
0x2d, 0x2c, 0x30, 0x76, 0xee, 0xdc, 0xc0, 0xc0,
0x89, 0x13, 0x96, 0xd5, 0xdd, 0xdd, 0x68, 0xa8,
0xaa, 0xb7, 0xae, 0xd9, 0x6c, 0x36, 0x5d, 0x17,
0xa0, 0x5a, 0x75, 0x9c, 0x62, 0x11, 0xc0, 0xb6,
0x2b, 0x15, 0xce, 0x01, 0x0c, 0xc3, 0x30, 0x0c,
0xa3, 0x73, 0x21, 0x1d, 0x0b, 0x10, 0xe0, 0x57,
0xae, 0x88, 0xe8, 0xcd, 0x9b, 0x6b, 0xd7, 0xc6,
0xc7, 0x47, 0x47, 0x01, 0x6a, 0xb5, 0x60, 0x90,
0x31, 0x80, 0xb5, 0xb5, 0x52, 0xc9, 0x34, 0x01,
0x1c, 0x07, 0xb1, 0x5e, 0x07, 0xa0, 0x94, 0x52,
0x42, 0x00, 0x08, 0x51, 0x55, 0x42, 0x00, 0x1c,
0xc7, 0xb6, 0x6d, 0x1b, 0x80, 0x52, 0x11, 0x9b,
0x66, 0x36, 0x5b, 0xab, 0x01, 0x10, 0x42, 0x29,
0x00, 0x40, 0x3c, 0x1e, 0x8f, 0xc7, 0xe3, 0x5e,
0x21, 0xa1, 0x90, 0x10, 0x62, 0x59, 0xdb, 0x16,
0x20, 0xc0, 0x0f, 0x1f, 0x16, 0x51, 0x32, 0x79,
0xe9, 0xd2, 0xd5, 0xab, 0xa3, 0xa3, 0x00, 0xcd,
0x26, 0xa2, 0x65, 0x01, 0x14, 0x0a, 0xa6, 0x99,
0xcd, 0xae, 0x3b, 0x9a, 0x00, 0x00, 0x70, 0xee,
0xba, 0x88, 0x00, 0x94, 0x2a, 0x0a, 0x21, 0x00,
0x88, 0x9a, 0x66, 0xdb, 0xa2, 0xf3, 0x88, 0x00,
0xb6, 0x5d, 0xad, 0x72, 0xde, 0x12, 0x20, 0xad,
0xbd, 0x10, 0x4d, 0x13, 0x42, 0x5c, 0x57, 0xfe,
0xa2, 0x42, 0x47, 0xf6, 0xe4, 0xc9, 0x85, 0x0b,
0x67, 0xcf, 0x1e, 0x3b, 0x66, 0xdb, 0xa2, 0xab,
0xba, 0x9e, 0xcf, 0x9b, 0xe6, 0xea, 0x2a, 0x00,
0x22, 0x63, 0xff, 0x56, 0xc9, 0x18, 0x21, 0xb6,
0x0d, 0xa0, 0xaa, 0x42, 0x88, 0xeb, 0xda, 0x36,
0xe7, 0x1b, 0xf3, 0xda, 0x83, 0xcb, 0x55, 0x6a,
0x81, 0x6f, 0x53, 0xc0, 0xe4, 0x24, 0x62, 0x7f,
0xbf, 0xae, 0x03, 0x64, 0xb3, 0xd5, 0x6a, 0x2a,
0x05, 0xa0, 0x28, 0x8a, 0x42, 0x29, 0x40, 0x24,
0x12, 0x0e, 0xef, 0xdb, 0x27, 0xb2, 0x28, 0x05,
0xd0, 0x34, 0x42, 0x74, 0x1d, 0x00, 0x71, 0xfd,
0x09, 0x88, 0x00, 0x8c, 0x01, 0x94, 0xcb, 0x9c,
0x2f, 0x2e, 0x02, 0x04, 0x02, 0xa1, 0x10, 0x21,
0x00, 0x03, 0x03, 0x86, 0x31, 0x38, 0xd8, 0xf9,
0x3b, 0xd0, 0xa1, 0x00, 0x01, 0x16, 0x0c, 0x02,
0x28, 0x0a, 0x21, 0xaa, 0x0a, 0xd0, 0xdb, 0xdb,
0xd7, 0xd7, 0xd3, 0x03, 0xa0, 0x69, 0xb9, 0x9c,
0x65, 0x01, 0xbc, 0x7d, 0xfb, 0xe9, 0xd3, 0xd2,
0x92, 0x7f, 0xfd, 0xc5, 0x8b, 0x93, 0x93, 0x67,
0xce, 0x00, 0xa8, 0x6a, 0x57, 0x17, 0xc0, 0xf6,
0xc1, 0xa5, 0x6d, 0xeb, 0x7f, 0x80, 0x10, 0x80,
0xee, 0xee, 0xde, 0xde, 0x60, 0x10, 0x20, 0x97,
0x2b, 0x14, 0x32, 0x19, 0x44, 0x01, 0x5e, 0x2a,
0x89, 0x8c, 0xe3, 0xc7, 0x05, 0x00, 0x21, 0xd2,
0xcb, 0x5a, 0x45, 0x21, 0x44, 0xd3, 0x76, 0x0e,
0xbe, 0x6d, 0x01, 0x8a, 0x02, 0xa0, 0xaa, 0x00,
0x86, 0xa1, 0x28, 0x43, 0x43, 0x88, 0x8b, 0x8b,
0x1f, 0x3f, 0x96, 0x4a, 0x72, 0xff, 0x6f, 0xdc,
0x10, 0x00, 0xdf, 0xbe, 0xf9, 0xd5, 0xdb, 0x36,
0x63, 0xb5, 0x9a, 0x17, 0xfc, 0xe0, 0xc1, 0x4e,
0xc1, 0xa5, 0x75, 0xbc, 0x42, 0xb6, 0x8d, 0x58,
0xa9, 0x30, 0xd6, 0x68, 0x20, 0xaa, 0xaa, 0x7c,
0xa9, 0x74, 0xfd, 0xe8, 0xd1, 0x4c, 0xc6, 0x71,
0xbe, 0x7e, 0x6d, 0xcd, 0xa8, 0xbd, 0xb5, 0x07,
0x4f, 0xa7, 0x3b, 0xe5, 0x90, 0xb6, 0xc5, 0x09,
0x48, 0xa0, 0x54, 0xea, 0xc0, 0x81, 0xb9, 0x39,
0xc6, 0x2a, 0x95, 0xb5, 0xb5, 0x46, 0xa3, 0x50,
0x68, 0x65, 0x3c, 0x7c, 0xf8, 0xe0, 0x01, 0x80,
0xbc, 0x48, 0xe5, 0x95, 0x28, 0xeb, 0x5a, 0x82,
0x1c, 0xa7, 0x56, 0x43, 0x3c, 0x74, 0x48, 0x80,
0x67, 0x32, 0x7e, 0x79, 0x5b, 0xb5, 0x4d, 0x26,
0xd0, 0x3a, 0x18, 0x11, 0x11, 0xf1, 0xf3, 0xe7,
0x5f, 0xbf, 0x4c, 0x73, 0x7e, 0x7e, 0x62, 0x82,
0x10, 0x80, 0xe1, 0x61, 0xef, 0x45, 0xa8, 0x28,
0x7e, 0x27, 0x09, 0xe0, 0x40, 0xc0, 0xd3, 0x3f,
0x4f, 0x03, 0xe5, 0x9d, 0xe5, 0xe7, 0xb7, 0x3c,
0x01, 0x6f, 0x47, 0x28, 0xad, 0x56, 0x57, 0x57,
0x01, 0xee, 0xdf, 0x9f, 0x99, 0xa9, 0xd7, 0x15,
0x25, 0x1c, 0x76, 0x5d, 0xc6, 0x1c, 0x07, 0x51,
0x55, 0x1b, 0x0d, 0x5d, 0x2f, 0x95, 0x12, 0x89,
0x47, 0x8f, 0x34, 0xed, 0xd6, 0xad, 0xf5, 0x42,
0xe4, 0xa7, 0x84, 0x9f, 0xd7, 0xb4, 0xf5, 0xb1,
0xac, 0xf3, 0x9f, 0xa0, 0xd7, 0x7c, 0x3a, 0xd6,
0x02, 0x97, 0xfe, 0xc7, 0x8f, 0x77, 0xef, 0x38,
0xb7, 0xac, 0x23, 0x47, 0x2e, 0x5f, 0xa6, 0x34,
0x9f, 0xcf, 0x64, 0x96, 0x97, 0x8b, 0xc5, 0xa9,
0xa9, 0xd3, 0xa7, 0xc7, 0xc7, 0xe3, 0x71, 0xce,
0xb3, 0xd9, 0x74, 0xba, 0x58, 0x1c, 0x1b, 0x33,
0xcd, 0x54, 0x0a, 0x71, 0x7a, 0xda, 0xb2, 0x0a,
0x85, 0xd6, 0x39, 0x12, 0xcc, 0xcf, 0xb7, 0x9e,
0xd3, 0x1e, 0xd8, 0x7f, 0x02, 0x9b, 0x08, 0xd8,
0xe8, 0x97, 0x96, 0x5e, 0xbd, 0xe2, 0xfc, 0xcb,
0x97, 0xc1, 0xc1, 0xb1, 0x31, 0x4a, 0x67, 0x67,
0xf3, 0xf9, 0x6c, 0xd6, 0x34, 0x6f, 0xdf, 0x8e,
0xc5, 0x22, 0x91, 0x5d, 0xbb, 0x56, 0x56, 0x7a,
0x7a, 0x86, 0x86, 0x18, 0xbb, 0x79, 0x73, 0xff,
0xfe, 0x91, 0x11, 0x4a, 0xbf, 0x7f, 0x5f, 0x5e,
0x7e, 0xff, 0x9e, 0x73, 0xb9, 0xeb, 0x5e, 0x50,
0x2f, 0xb0, 0x14, 0x24, 0x81, 0xe5, 0x8a, 0xfa,
0xaf, 0xd2, 0x26, 0x02, 0xfc, 0x05, 0x25, 0x93,
0x33, 0x33, 0x9c, 0x27, 0x93, 0x7b, 0xf6, 0xc4,
0xe3, 0x84, 0x3c, 0x7d, 0xea, 0x38, 0xaa, 0xea,
0xba, 0x9a, 0x26, 0x32, 0x08, 0x21, 0x84, 0x52,
0x42, 0x2a, 0x15, 0xc3, 0x18, 0x1e, 0xa6, 0xd4,
0xb6, 0x43, 0xa1, 0xfe, 0x7e, 0x42, 0x5c, 0xb7,
0x54, 0xfa, 0xf9, 0x13, 0xd1, 0xb6, 0x39, 0x77,
0xdd, 0x8d, 0x60, 0x5e, 0x60, 0x3f, 0x01, 0x2d,
0x3e, 0x9f, 0xdd, 0xf2, 0x0a, 0xf0, 0x76, 0xca,
0x6f, 0x47, 0x29, 0x1d, 0x19, 0xb9, 0x7b, 0x57,
0x51, 0x22, 0x91, 0x68, 0xf4, 0xe4, 0x49, 0x4a,
0xaf, 0x5f, 0x17, 0x1f, 0x69, 0xd1, 0xa8, 0xf8,
0x56, 0xca, 0xe5, 0xe6, 0xe7, 0x9f, 0x3d, 0x63,
0xec, 0xf9, 0x73, 0xce, 0x19, 0x43, 0xe4, 0xbc,
0xaf, 0x8f, 0x73, 0x45, 0xe1, 0xdc, 0x30, 0x62,
0x31, 0x42, 0x54, 0x55, 0xd7, 0xbb, 0xba, 0x10,
0x39, 0x4f, 0xa7, 0x57, 0x56, 0x10, 0xeb, 0xf5,
0xb9, 0xb9, 0xd9, 0x59, 0xc6, 0xe4, 0x75, 0xed,
0x15, 0xb6, 0xe5, 0xaf, 0x51, 0xff, 0x95, 0x6a,
0xef, 0xfd, 0x1a, 0xe1, 0x67, 0x7e, 0xb7, 0xce,
0xe6, 0x2b, 0xf4, 0xd7, 0xdb, 0x3f, 0xc6, 0xc6,
0x73, 0xce, 0xcc, 0x6b, 0x02, 0xd3, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};

287
art/tango/edit_undo.h Normal file
View File

@@ -0,0 +1,287 @@
/* edit_undo.png - 650 bytes */
static const unsigned char edit_undo_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd6, 0x07, 0x1a, 0x0a, 0x0e, 0x00, 0x16,
0x23, 0x96, 0x21, 0x00, 0x00, 0x02, 0x17, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0x4f,
0x68, 0x92, 0x61, 0x1c, 0xc7, 0xbf, 0xcf, 0xf3,
0xbe, 0xcf, 0xd4, 0xe5, 0xfe, 0xe8, 0xc6, 0x1a,
0xd2, 0x88, 0xd6, 0xc1, 0xf2, 0x10, 0x14, 0x84,
0x41, 0x83, 0x15, 0x04, 0x42, 0xb0, 0x43, 0x78,
0x08, 0x82, 0x62, 0x44, 0x50, 0x5d, 0x3b, 0x8c,
0x3c, 0x78, 0x28, 0xc7, 0x8c, 0x1d, 0x22, 0xba,
0x74, 0xa9, 0x58, 0x41, 0x10, 0x34, 0xe9, 0x50,
0x2c, 0x16, 0xc1, 0x52, 0x8c, 0x5a, 0x76, 0x8a,
0x94, 0xb4, 0x68, 0x0d, 0x72, 0x13, 0x5c, 0xbe,
0x3a, 0xe7, 0x86, 0xef, 0xeb, 0xf3, 0x3c, 0x1d,
0xc2, 0xa5, 0x9b, 0x96, 0x7d, 0x6f, 0xcf, 0x17,
0xbe, 0x9f, 0xe7, 0x79, 0x7e, 0xcf, 0xf7, 0x01,
0x9a, 0x28, 0x3a, 0x05, 0x89, 0x16, 0xa4, 0x6e,
0x35, 0xe6, 0xee, 0xa1, 0x97, 0x29, 0xc8, 0xa2,
0x45, 0xd1, 0xda, 0x85, 0xdf, 0xc7, 0x6c, 0x4c,
0x41, 0xd6, 0xed, 0x0d, 0xb5, 0x9a, 0xff, 0x73,
0x02, 0xbf, 0x8f, 0xd9, 0x3c, 0x4e, 0x23, 0xe7,
0xf6, 0x86, 0x80, 0xc2, 0xd5, 0xcd, 0x6b, 0xe8,
0xa4, 0x27, 0xc3, 0x05, 0xcd, 0x80, 0xb6, 0xc5,
0xc3, 0xc9, 0xec, 0xc5, 0xf1, 0x09, 0xbd, 0x54,
0x0b, 0x20, 0x5b, 0xc3, 0x46, 0x6e, 0x1c, 0x2a,
0xd5, 0x00, 0x8b, 0x17, 0x90, 0x15, 0x70, 0x2e,
0x01, 0x88, 0xf2, 0x9b, 0xd9, 0xc7, 0x5f, 0x19,
0x05, 0x79, 0x95, 0x28, 0x78, 0x02, 0x41, 0xe3,
0x47, 0x15, 0xa0, 0xf8, 0x7d, 0xac, 0xdd, 0xe3,
0x34, 0x56, 0xdd, 0xde, 0x10, 0x8c, 0x9f, 0xd7,
0x41, 0x28, 0x45, 0xb9, 0x0c, 0x80, 0x2f, 0x42,
0x5f, 0x4f, 0x41, 0x5b, 0x89, 0x41, 0xca, 0x92,
0x3a, 0xe8, 0x3a, 0xd1, 0x67, 0xb6, 0x28, 0xbd,
0x36, 0xe4, 0x4f, 0x0f, 0xec, 0xab, 0xbc, 0x8e,
0x44, 0xc5, 0x32, 0x00, 0x28, 0x13, 0x17, 0x84,
0x5e, 0x0d, 0x53, 0xaa, 0xfc, 0xa6, 0xaa, 0x0c,
0x52, 0x4a, 0x08, 0xc1, 0x21, 0x84, 0x80, 0xe0,
0x6b, 0x28, 0xaf, 0xa7, 0x60, 0xb2, 0x98, 0xc8,
0x8e, 0xae, 0x5d, 0x9d, 0x9d, 0x62, 0xed, 0xd0,
0xee, 0xfd, 0xfa, 0xa3, 0x48, 0x54, 0x18, 0xf4,
0x65, 0x92, 0xd9, 0xe7, 0x43, 0x5e, 0xb0, 0x8e,
0x93, 0x00, 0x00, 0xce, 0x75, 0x2c, 0x7c, 0xfb,
0x88, 0xc5, 0xef, 0x71, 0xa4, 0xd3, 0x5f, 0xea,
0x06, 0x56, 0xd4, 0xe2, 0xb0, 0xf7, 0xbb, 0x60,
0x6e, 0x67, 0x07, 0x86, 0x9d, 0xdd, 0xe1, 0xed,
0x33, 0x18, 0x19, 0xc3, 0x42, 0xe2, 0x26, 0xf6,
0xb8, 0xae, 0x40, 0xf0, 0x62, 0x5d, 0x58, 0x14,
0xef, 0x22, 0x93, 0x65, 0x28, 0xeb, 0x1c, 0x3d,
0x8e, 0x4b, 0xf8, 0xf4, 0x76, 0xba, 0x74, 0xfc,
0x6c, 0xda, 0xaa, 0x02, 0x40, 0x20, 0x68, 0x68,
0xf0, 0x31, 0x3b, 0x30, 0x99, 0x73, 0x8f, 0x8c,
0x01, 0x00, 0x62, 0x33, 0x77, 0xea, 0xdf, 0xcb,
0x42, 0xe0, 0x3a, 0x72, 0x19, 0x85, 0xcc, 0x03,
0x98, 0xcc, 0x3a, 0x08, 0x91, 0x6a, 0x5d, 0x0f,
0x02, 0x41, 0x43, 0x9b, 0x4d, 0x32, 0xfb, 0xfc,
0xb3, 0xc9, 0xcd, 0xcc, 0xd0, 0x28, 0xc8, 0xd0,
0x28, 0x08, 0x80, 0x83, 0xa5, 0xbc, 0x3c, 0x95,
0x98, 0xbb, 0xfd, 0xbe, 0x6f, 0xe0, 0x1c, 0xb8,
0xe8, 0x00, 0x91, 0xd2, 0x84, 0xbf, 0xd5, 0xb8,
0x51, 0x95, 0xc3, 0xf7, 0xe1, 0x78, 0x37, 0x4d,
0xe5, 0xea, 0xf2, 0x0d, 0x11, 0x79, 0x68, 0x93,
0xdb, 0x9a, 0x58, 0xbb, 0x73, 0x23, 0x7f, 0xf8,
0x3c, 0x96, 0x14, 0x61, 0x95, 0x1b, 0xc5, 0x38,
0x84, 0x6a, 0xcf, 0x37, 0x05, 0x34, 0x83, 0x44,
0xa7, 0x30, 0xd8, 0xed, 0x38, 0x2c, 0xb4, 0xec,
0x12, 0x00, 0xdc, 0x6a, 0xf8, 0x99, 0xfe, 0xa1,
0xa3, 0x5d, 0x3b, 0xf7, 0xce, 0x7c, 0x8e, 0x3d,
0xa9, 0x1c, 0x3b, 0xa3, 0x5d, 0xfb, 0x6f, 0x80,
0x6c, 0xeb, 0xb7, 0xa6, 0x3e, 0x3c, 0x7f, 0x41,
0x75, 0xed, 0x69, 0xd5, 0xfb, 0x05, 0x05, 0x16,
0xe2, 0x25, 0x2b, 0xbe, 0x24, 0x14, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};
/* edit_undo.png - 1586 bytes */
static const unsigned char edit_undo_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
0xbd, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xe5,
0x97, 0x4b, 0x68, 0x13, 0x5d, 0x18, 0x86, 0xdf,
0x33, 0x97, 0x4c, 0xe2, 0x34, 0x69, 0x53, 0x13,
0x9b, 0x34, 0xf6, 0x6a, 0xac, 0xf5, 0xb6, 0xd0,
0x8d, 0x88, 0x56, 0xb0, 0x8a, 0x8a, 0x22, 0x16,
0x75, 0x53, 0x91, 0x22, 0x52, 0xa1, 0xab, 0x2e,
0x15, 0x37, 0x0a, 0xe2, 0x65, 0x29, 0x2a, 0xba,
0x50, 0x90, 0xd2, 0x8d, 0xa5, 0x22, 0x28, 0x8a,
0x20, 0xda, 0x68, 0x6b, 0xb5, 0x76, 0xd1, 0x6a,
0xa5, 0x82, 0x56, 0xeb, 0x25, 0xbd, 0x25, 0xd6,
0xa4, 0x21, 0xd7, 0x49, 0xe6, 0xf6, 0x2f, 0xe6,
0x1f, 0x42, 0x52, 0x63, 0x6a, 0x15, 0x85, 0xff,
0x3f, 0x9b, 0x97, 0x99, 0x9c, 0x73, 0xe6, 0x7d,
0xbe, 0xf3, 0x7d, 0xe7, 0x9c, 0x00, 0xff, 0xf7,
0xd6, 0xd5, 0xd5, 0xd1, 0x51, 0x5d, 0xdd, 0xdc,
0xdc, 0xdb, 0xdb, 0xd6, 0x06, 0xa8, 0xea, 0x9f,
0xfe, 0x3e, 0x35, 0xdf, 0x81, 0xb7, 0x6f, 0x5f,
0xbf, 0x5e, 0x56, 0xb6, 0x79, 0x33, 0xc7, 0x09,
0xc2, 0xc7, 0x8f, 0xd7, 0xae, 0xfd, 0x69, 0xe3,
0xf3, 0x06, 0xd0, 0x8d, 0xdb, 0x6c, 0x14, 0x35,
0x36, 0xe6, 0xf1, 0xac, 0x5b, 0xb7, 0x63, 0xc7,
0xf6, 0xed, 0x7f, 0xcb, 0xfe, 0x4f, 0x00, 0xcc,
0x36, 0xbe, 0x75, 0xeb, 0xd2, 0xa5, 0x00, 0x20,
0xcb, 0xe3, 0xe3, 0x7f, 0x0f, 0x80, 0x99, 0xaf,
0x71, 0x51, 0x54, 0xd5, 0x8a, 0x0a, 0x80, 0x65,
0x19, 0x66, 0xc1, 0x02, 0xad, 0xef, 0x9b, 0x37,
0x80, 0x5e, 0x0b, 0xc9, 0xa4, 0x28, 0x02, 0x43,
0x43, 0x82, 0x20, 0x8a, 0xc0, 0xcb, 0x97, 0xc9,
0xa4, 0xa2, 0x10, 0xd2, 0xd9, 0x39, 0x38, 0x38,
0x39, 0xc9, 0xb2, 0x3d, 0x3d, 0xa7, 0x4f, 0x9f,
0x3d, 0x9b, 0x4a, 0xc5, 0x62, 0xbf, 0x0a, 0x40,
0xff, 0xac, 0x71, 0x55, 0x95, 0xa4, 0x2f, 0x5f,
0x00, 0xc0, 0x60, 0x58, 0xbb, 0x16, 0x20, 0x84,
0x10, 0x49, 0x02, 0x4a, 0x4b, 0x2b, 0x2b, 0x79,
0x1e, 0x70, 0xb9, 0xaa, 0xab, 0x5d, 0x2e, 0xc0,
0x6e, 0x77, 0xb9, 0x9c, 0x4e, 0x87, 0xa3, 0xa8,
0xc8, 0x62, 0xa1, 0xe9, 0x68, 0x34, 0x14, 0x0a,
0x04, 0xc2, 0xe1, 0x25, 0x4b, 0x56, 0xac, 0x58,
0xb4, 0x48, 0x96, 0xf7, 0xee, 0x75, 0xb9, 0x96,
0x2f, 0x67, 0xd9, 0xe7, 0xcf, 0x7b, 0x7a, 0x7a,
0x7b, 0x15, 0x25, 0x1c, 0xfe, 0x6d, 0x00, 0xf7,
0xef, 0xb7, 0xb7, 0x57, 0x54, 0x6c, 0xd8, 0x60,
0xb5, 0x02, 0x5e, 0x6f, 0x77, 0xb7, 0x6e, 0x3c,
0x91, 0x10, 0xc5, 0xea, 0x6a, 0x80, 0xa2, 0x8c,
0xc6, 0x35, 0x6b, 0xd2, 0xfd, 0x55, 0x15, 0x60,
0x59, 0x00, 0xa0, 0x28, 0xa7, 0x53, 0x53, 0x9b,
0x0d, 0x60, 0x18, 0x8e, 0x2b, 0x2d, 0x05, 0x78,
0xbe, 0xa0, 0x40, 0x51, 0xca, 0xcb, 0x2b, 0x2b,
0x6b, 0x6a, 0x96, 0x2d, 0x5b, 0xb9, 0x92, 0x65,
0x39, 0x4e, 0x92, 0x6a, 0x6b, 0x6d, 0x36, 0x55,
0x9d, 0x99, 0xd9, 0xb4, 0x49, 0x03, 0x19, 0x18,
0xd0, 0x40, 0xa6, 0xa6, 0xe6, 0x0d, 0xd0, 0xd5,
0x75, 0xe3, 0xc6, 0x92, 0x25, 0x4d, 0x4d, 0x3c,
0x2f, 0x49, 0x9f, 0x3e, 0xdd, 0xbd, 0xab, 0x1b,
0x8f, 0xc7, 0x45, 0xb1, 0xa2, 0x02, 0xa0, 0x28,
0x42, 0x18, 0x06, 0xa0, 0x69, 0x86, 0xe1, 0xb8,
0xef, 0x4f, 0x26, 0xcb, 0x80, 0x28, 0xa6, 0x52,
0x91, 0x08, 0x90, 0x4c, 0x26, 0x12, 0x7e, 0x3f,
0x30, 0x36, 0xe6, 0xf5, 0xf6, 0xf5, 0x69, 0xa0,
0x46, 0x23, 0xc0, 0xf3, 0x16, 0x8b, 0xc5, 0x42,
0x88, 0xc5, 0x62, 0xb7, 0x97, 0x97, 0xbb, 0x5c,
0x46, 0x63, 0x2c, 0xe6, 0xf5, 0xca, 0x72, 0x65,
0xe5, 0xaa, 0x55, 0x2c, 0xfb, 0xe4, 0x89, 0x06,
0x22, 0x8a, 0x73, 0x05, 0x20, 0xd9, 0x2f, 0xee,
0xdc, 0xd1, 0x52, 0x67, 0xe1, 0xc2, 0xcc, 0xd4,
0x11, 0x04, 0x49, 0x72, 0xbb, 0xb5, 0x3e, 0xda,
0xf4, 0x84, 0x18, 0x8d, 0x40, 0x3c, 0x1e, 0x8d,
0x4e, 0x4e, 0x02, 0x81, 0xc0, 0xf4, 0xf4, 0xeb,
0xd7, 0xf9, 0x3f, 0xc8, 0x30, 0x0c, 0x03, 0x00,
0x25, 0x25, 0x8b, 0x17, 0x6f, 0xdb, 0x06, 0x0c,
0x0e, 0x3e, 0x7b, 0xf6, 0xe2, 0xc5, 0xab, 0x57,
0x89, 0x44, 0x24, 0x12, 0x0c, 0xf6, 0xf7, 0xef,
0xdc, 0xd9, 0xd2, 0x02, 0xb4, 0xb4, 0xcc, 0x1b,
0x40, 0x6f, 0xb9, 0x6a, 0xc0, 0xef, 0xff, 0xfa,
0x35, 0x95, 0x02, 0xc2, 0xe1, 0x70, 0x78, 0x62,
0x02, 0x58, 0xba, 0xd4, 0xed, 0xae, 0xaa, 0x02,
0x00, 0x9a, 0x76, 0x38, 0xd2, 0xe3, 0x05, 0x41,
0x10, 0x12, 0x09, 0x20, 0x16, 0x8b, 0x46, 0x7d,
0x3e, 0x40, 0x10, 0xa2, 0xd1, 0x60, 0x10, 0x20,
0x84, 0x61, 0x08, 0x01, 0x0c, 0x06, 0x93, 0xa9,
0xac, 0x0c, 0x48, 0x26, 0x45, 0xb1, 0xb6, 0x16,
0x18, 0x1d, 0x1d, 0x18, 0xb8, 0x7d, 0x7b, 0x78,
0x78, 0xcb, 0x96, 0xe6, 0x66, 0x60, 0xf5, 0xea,
0xb9, 0x02, 0xe4, 0xdc, 0x85, 0x1a, 0x1a, 0x0e,
0x1f, 0x1e, 0x1b, 0x7b, 0xfc, 0x58, 0x03, 0xa9,
0xaf, 0xef, 0xeb, 0xf3, 0x78, 0xa6, 0xa6, 0x3c,
0x9e, 0xf5, 0xeb, 0xeb, 0xeb, 0x9d, 0x4e, 0x20,
0x1e, 0xcf, 0xdc, 0x41, 0xfa, 0xfb, 0x1f, 0x3c,
0x78, 0xfa, 0x74, 0xf6, 0x3c, 0xe1, 0xb0, 0xaa,
0x16, 0x14, 0x00, 0x0e, 0x87, 0xd3, 0x59, 0x5e,
0xae, 0xaa, 0x85, 0x85, 0x45, 0x45, 0x13, 0x13,
0x84, 0x00, 0xc9, 0x64, 0x38, 0xac, 0xd5, 0x88,
0x24, 0x01, 0x80, 0xc1, 0x60, 0xb7, 0x57, 0x56,
0x02, 0xc0, 0xf4, 0xf4, 0x5c, 0xed, 0xcf, 0xe1,
0x1c, 0xd0, 0x41, 0x82, 0x41, 0x49, 0xb2, 0x5a,
0xeb, 0xeb, 0xfb, 0xfb, 0x1f, 0x3d, 0x7a, 0xff,
0x1e, 0xa8, 0xaa, 0xaa, 0xaa, 0xd2, 0x22, 0x9f,
0xd9, 0x36, 0x6e, 0x3c, 0x74, 0x08, 0x20, 0x44,
0xd7, 0x60, 0x30, 0x12, 0x31, 0x1a, 0x1b, 0x1b,
0x43, 0xa1, 0x40, 0xe0, 0xdb, 0xb7, 0xe9, 0xe9,
0x44, 0x22, 0x16, 0x2b, 0x29, 0x51, 0x55, 0x59,
0x96, 0x24, 0x59, 0xd6, 0x6a, 0x43, 0x14, 0x01,
0x51, 0x54, 0x14, 0x9a, 0x2e, 0x28, 0x90, 0x24,
0xbf, 0x7f, 0xcf, 0x1e, 0xa7, 0x53, 0xd7, 0x5f,
0x06, 0xc8, 0x04, 0x79, 0xf2, 0x64, 0x7c, 0x3c,
0x91, 0x70, 0x3a, 0x77, 0xed, 0xd2, 0x41, 0x00,
0x86, 0xa9, 0xae, 0x9e, 0x35, 0x2d, 0xa5, 0xeb,
0xc1, 0x83, 0xad, 0xad, 0xdf, 0xbe, 0x75, 0x76,
0xfa, 0x7c, 0xc1, 0x20, 0x21, 0x47, 0x8e, 0x4c,
0x4c, 0x4c, 0x4c, 0x84, 0x42, 0x00, 0xc7, 0x99,
0x4c, 0x85, 0x85, 0xaa, 0x2a, 0x49, 0xa2, 0x18,
0x08, 0xa8, 0xaa, 0xa2, 0xc8, 0xb2, 0x20, 0x00,
0x92, 0xa4, 0x28, 0x46, 0x63, 0x5a, 0x7f, 0x53,
0xd3, 0x0d, 0xd1, 0xff, 0xee, 0x5a, 0x2c, 0xdb,
0xde, 0x7e, 0xf1, 0xa2, 0xc3, 0xb1, 0x7b, 0xb7,
0x7e, 0x70, 0x65, 0x5e, 0xe6, 0x0c, 0x86, 0xef,
0x2b, 0xcb, 0x3e, 0x7c, 0xd8, 0xd6, 0x66, 0xb5,
0x86, 0x42, 0x81, 0xc0, 0xbb, 0x77, 0xab, 0x56,
0xc9, 0xf2, 0x87, 0x0f, 0xfd, 0xfd, 0x0e, 0x87,
0x24, 0xdd, 0xbf, 0x7f, 0xf5, 0xaa, 0xd9, 0xac,
0x8f, 0x27, 0x64, 0x2e, 0xae, 0x7e, 0xb0, 0x02,
0xfa, 0x04, 0xe9, 0x48, 0x6a, 0xca, 0x30, 0xba,
0xa1, 0xa6, 0xa6, 0xd6, 0x56, 0x9f, 0xcf, 0xe3,
0x19, 0x1e, 0xf6, 0xfb, 0x4b, 0x4a, 0xf6, 0xed,
0xcb, 0x1c, 0x9f, 0x0b, 0x80, 0xe3, 0x68, 0x9a,
0x10, 0x55, 0x05, 0x28, 0x8a, 0xa2, 0x58, 0x36,
0x95, 0x0a, 0x87, 0x23, 0x91, 0x05, 0x0b, 0x52,
0x29, 0x59, 0x96, 0xe5, 0x64, 0x52, 0x3f, 0x07,
0xf4, 0x40, 0x51, 0x79, 0x33, 0x24, 0x47, 0x11,
0x67, 0x03, 0x68, 0x47, 0x55, 0x7a, 0x62, 0x1d,
0x84, 0xa2, 0x5a, 0x5a, 0x8e, 0x1d, 0xf3, 0xfb,
0xbb, 0xbb, 0xb5, 0x67, 0x9b, 0x4d, 0x53, 0x7d,
0xf1, 0x67, 0x47, 0x32, 0x91, 0x50, 0x14, 0x8e,
0xf3, 0xf9, 0x08, 0x61, 0x18, 0x9e, 0x77, 0x3a,
0x23, 0x91, 0x40, 0xe0, 0xed, 0x5b, 0x8a, 0x12,
0x45, 0x49, 0x22, 0x44, 0x3b, 0xe3, 0xd3, 0xc0,
0x5a, 0x79, 0xa7, 0x55, 0x51, 0xf2, 0x00, 0xe8,
0x1f, 0xcc, 0xb7, 0x02, 0xba, 0x66, 0x47, 0x2a,
0xfb, 0x7d, 0x7a, 0xbe, 0x6b, 0xd7, 0x4e, 0x9f,
0x2e, 0x2c, 0x6c, 0x68, 0x30, 0x9b, 0xcd, 0x66,
0x42, 0x1c, 0x8e, 0x54, 0x4a, 0x92, 0x58, 0x76,
0x72, 0x72, 0x7c, 0x7c, 0x6a, 0x4a, 0x51, 0xec,
0xf6, 0x58, 0x2c, 0x14, 0x4a, 0x26, 0x3b, 0x3a,
0xb4, 0xfe, 0xfa, 0xed, 0x2a, 0x91, 0xc8, 0x34,
0xae, 0xa7, 0x58, 0xfa, 0x7f, 0x47, 0x9e, 0xcb,
0x5c, 0x36, 0x50, 0x2e, 0x30, 0x7d, 0x85, 0xb2,
0x57, 0x8a, 0xa6, 0xcd, 0x66, 0xb3, 0x19, 0x60,
0x18, 0xb7, 0xbb, 0xa6, 0x86, 0xe7, 0x8f, 0x1f,
0xaf, 0xaa, 0x72, 0xbb, 0xe3, 0x71, 0x9f, 0xef,
0xd6, 0xad, 0x9b, 0x37, 0xbb, 0xbb, 0x59, 0xf6,
0xeb, 0x57, 0xbf, 0x5f, 0x55, 0xcf, 0x9c, 0x39,
0x79, 0xf2, 0xc2, 0x05, 0xe0, 0xde, 0x3d, 0x6d,
0x9c, 0x7e, 0xd6, 0xeb, 0x27, 0xb2, 0xae, 0xd9,
0x20, 0x39, 0x2f, 0x73, 0xb9, 0x0c, 0xd3, 0x79,
0xfa, 0xa7, 0x23, 0xef, 0x76, 0xbb, 0xdd, 0x14,
0xc5, 0xf3, 0xed, 0xed, 0xe7, 0xcf, 0x5b, 0xad,
0x97, 0x2f, 0x5b, 0xad, 0x45, 0x45, 0x82, 0x10,
0x89, 0x78, 0x3c, 0xdd, 0xdd, 0xd1, 0xa8, 0x2c,
0x4f, 0x4e, 0x7e, 0xf9, 0xa2, 0x28, 0x27, 0x4e,
0x9c, 0x3a, 0x75, 0xe5, 0x0a, 0xd0, 0xd3, 0x93,
0x99, 0x2a, 0xd9, 0xc6, 0xb3, 0x53, 0x28, 0x0d,
0x40, 0x7e, 0x6c, 0x28, 0x57, 0x6a, 0xa4, 0x9f,
0x59, 0x96, 0x65, 0x01, 0x86, 0xa9, 0xab, 0xdb,
0xb0, 0x81, 0xe3, 0xac, 0xd6, 0xba, 0xba, 0x35,
0x6b, 0x68, 0xda, 0xe9, 0xb4, 0x58, 0x78, 0x5e,
0x51, 0x8a, 0x8b, 0x8d, 0x46, 0x8e, 0x93, 0xe5,
0xe5, 0xcb, 0x63, 0xb1, 0x78, 0x5c, 0x92, 0x28,
0xea, 0xe8, 0xd1, 0x73, 0xe7, 0x54, 0xb5, 0xad,
0x2d, 0xd3, 0x88, 0x2c, 0x67, 0x6a, 0x2a, 0x95,
0xa9, 0x3a, 0x80, 0xfe, 0x7b, 0xba, 0x16, 0x72,
0xd4, 0x00, 0x70, 0xe0, 0x40, 0x63, 0xa3, 0xc1,
0x40, 0x88, 0xc9, 0x64, 0x32, 0xa9, 0xaa, 0xc1,
0x20, 0x08, 0x82, 0xc0, 0x30, 0x84, 0x8c, 0x8c,
0x8c, 0x8c, 0x28, 0x8a, 0xa2, 0xc8, 0xb2, 0x2c,
0x2b, 0x0a, 0x21, 0x9a, 0x09, 0x59, 0xde, 0xbf,
0xbf, 0xae, 0x4e, 0x14, 0x79, 0xbe, 0xb8, 0xb8,
0xb8, 0x58, 0x51, 0xec, 0xf6, 0xd1, 0x51, 0xaf,
0x57, 0x14, 0xbd, 0xde, 0xcf, 0x9f, 0x47, 0x47,
0x81, 0xa1, 0xa1, 0x4b, 0x97, 0x6e, 0xdc, 0x00,
0x66, 0x66, 0xb2, 0x23, 0x98, 0x69, 0x48, 0xd7,
0x6c, 0xa0, 0xd9, 0x91, 0xcf, 0xb3, 0x02, 0xf9,
0x52, 0x2a, 0x57, 0x8a, 0x65, 0xef, 0x3a, 0xf9,
0x9e, 0xb3, 0x8b, 0x52, 0xd7, 0x6c, 0xa0, 0xd9,
0xc5, 0xfb, 0x9f, 0x69, 0xff, 0x00, 0xcd, 0x22,
0xea, 0x2d, 0xd8, 0x5b, 0x2a, 0x93, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};

197
art/tango/folder.h Normal file
View File

@@ -0,0 +1,197 @@
/* folder.png - 498 bytes */
static const unsigned char folder_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0b, 0x0a, 0x12, 0x39, 0x0d, 0xf9,
0xdd, 0x70, 0x50, 0x00, 0x00, 0x01, 0x7f, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x91, 0x4d,
0x88, 0x52, 0x51, 0x18, 0x86, 0x9f, 0x63, 0x2a,
0xfe, 0x40, 0xa6, 0x8b, 0x10, 0x5a, 0x04, 0x41,
0xb4, 0x0e, 0x82, 0x99, 0x20, 0x9a, 0xe5, 0x2c,
0xe3, 0x62, 0x11, 0xb4, 0xa9, 0x88, 0x20, 0x88,
0xfe, 0x98, 0xdd, 0x6c, 0x66, 0xb6, 0xb3, 0x08,
0xa2, 0x5d, 0x50, 0x33, 0xce, 0x2a, 0x44, 0xa4,
0x65, 0x49, 0x50, 0xb6, 0x6c, 0x17, 0x18, 0x46,
0x9b, 0x88, 0x22, 0x28, 0x05, 0x0b, 0xb1, 0x7b,
0x8f, 0x47, 0xcf, 0xfd, 0x66, 0x71, 0xed, 0x0a,
0xe2, 0x05, 0xcd, 0x97, 0x0f, 0x0e, 0x9c, 0xc3,
0xf7, 0xbc, 0x2f, 0xef, 0x51, 0x97, 0x2e, 0x97,
0xb6, 0x8a, 0xc5, 0xe2, 0x36, 0x53, 0x32, 0xc6,
0x04, 0xe7, 0xc0, 0xdc, 0xda, 0xdb, 0xdd, 0x7f,
0x42, 0x84, 0xd4, 0x9d, 0x7b, 0xb7, 0xe5, 0xfa,
0xd5, 0x1b, 0x33, 0x1f, 0xb5, 0xf6, 0x78, 0xb6,
0xf7, 0x94, 0x5e, 0xaf, 0x77, 0xa5, 0x5a, 0xa9,
0x3d, 0x8f, 0x04, 0x94, 0x9c, 0x8b, 0xb4, 0x3e,
0xb5, 0xa2, 0x4c, 0x78, 0xdb, 0x78, 0x33, 0x7d,
0xf5, 0xa8, 0x5a, 0xa9, 0x3d, 0x00, 0x88, 0x03,
0xa4, 0xd3, 0x19, 0x8e, 0xe4, 0xf2, 0x91, 0x00,
0xe7, 0x42, 0x29, 0x70, 0x53, 0x0a, 0xa5, 0x14,
0xb5, 0x17, 0xd5, 0xfb, 0x40, 0x00, 0x30, 0xc6,
0xe0, 0x79, 0x2e, 0xaf, 0x3f, 0xf6, 0x69, 0x76,
0x32, 0xcc, 0xa5, 0xc3, 0x0e, 0x67, 0x6e, 0x3a,
0x52, 0x48, 0xe9, 0xcf, 0x61, 0x82, 0x66, 0x27,
0xc3, 0xe3, 0x8d, 0x75, 0xb4, 0xb1, 0x73, 0x31,
0x52, 0xc9, 0x43, 0xdc, 0x7d, 0x58, 0x3f, 0x15,
0x07, 0xf0, 0x3c, 0x17, 0x80, 0x9f, 0xbf, 0x35,
0x5f, 0xda, 0x7f, 0xe7, 0x02, 0x9c, 0x38, 0x9a,
0x05, 0x20, 0xa6, 0xb5, 0x26, 0x9d, 0x9e, 0x33,
0xfa, 0x0c, 0xc5, 0x5c, 0xd7, 0x0d, 0x13, 0xfc,
0x17, 0xe0, 0x5f, 0x07, 0x4b, 0x01, 0x16, 0x4d,
0x60, 0xad, 0x8f, 0x1e, 0x06, 0x65, 0x87, 0xbf,
0x90, 0x88, 0xf9, 0x08, 0x20, 0x22, 0x28, 0xa5,
0x10, 0x11, 0x44, 0xc0, 0x17, 0xc1, 0x5a, 0x61,
0x68, 0x7d, 0xcc, 0x48, 0x18, 0x8c, 0x2c, 0x43,
0x2b, 0xe4, 0xb2, 0xc9, 0x09, 0xc0, 0xf3, 0x5c,
0x8e, 0xe7, 0x06, 0x74, 0xfb, 0x86, 0x1f, 0x5d,
0x0f, 0x44, 0xe1, 0x23, 0x8c, 0x07, 0x11, 0x10,
0x04, 0x91, 0x31, 0x18, 0x18, 0x59, 0x99, 0x00,
0x7e, 0x75, 0xda, 0x9c, 0x3e, 0x7b, 0x8e, 0x0f,
0x5f, 0xff, 0x8c, 0x97, 0x02, 0x77, 0x11, 0xf0,
0x11, 0x04, 0x05, 0x22, 0x61, 0xaa, 0x95, 0x93,
0x05, 0xea, 0x2f, 0x5f, 0x91, 0xd7, 0xdf, 0xcb,
0xea, 0xfc, 0xb5, 0x9d, 0x86, 0x9b, 0x38, 0xb6,
0xb6, 0x68, 0x79, 0xd9, 0xe1, 0xb7, 0xf7, 0xef,
0xca, 0x9b, 0xab, 0x2c, 0xab, 0x03, 0xc2, 0x87,
0xb4, 0xca, 0xa7, 0xb0, 0xe2, 0xf8, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};
/* folder.png - 1019 bytes */
static const unsigned char folder_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x03,
0x86, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0xcd, 0x4b, 0x1b, 0x41, 0x14, 0x7f, 0x3b,
0x9b, 0x68, 0x22, 0x46, 0x8a, 0x8a, 0xa0, 0x05,
0x7b, 0x4f, 0xed, 0xc9, 0x42, 0xb1, 0x20, 0xfa,
0x67, 0xf4, 0xaa, 0x12, 0x24, 0x88, 0x44, 0x2f,
0xbd, 0xb4, 0x16, 0x0a, 0x3d, 0xb5, 0xb4, 0x9e,
0x64, 0xb5, 0x22, 0x08, 0x8a, 0xf8, 0x41, 0xcf,
0xde, 0x5a, 0x0f, 0x82, 0xa0, 0xf8, 0x95, 0x48,
0x89, 0xf1, 0xd0, 0x43, 0x5b, 0x13, 0x4d, 0x4d,
0x4c, 0x36, 0xd9, 0xec, 0xe7, 0x4c, 0x0f, 0xeb,
0xeb, 0x26, 0x9b, 0x6c, 0x35, 0xb4, 0xa8, 0x07,
0x7f, 0x97, 0x37, 0xef, 0xcd, 0xce, 0xcc, 0xfb,
0xbd, 0xdf, 0xce, 0xbe, 0x04, 0xe0, 0x0e, 0x77,
0xf8, 0x27, 0x70, 0xf6, 0xc0, 0xc8, 0xc8, 0xe8,
0x68, 0x28, 0xf4, 0xfa, 0xb5, 0x61, 0x50, 0xaa,
0xeb, 0xaf, 0x5e, 0x5d, 0xb6, 0x81, 0xaa, 0xaa,
0xaa, 0xaa, 0x5a, 0x3e, 0xa5, 0x86, 0x41, 0xe9,
0xb3, 0x67, 0xd3, 0xd3, 0x1f, 0x3f, 0xce, 0xcc,
0x2c, 0x2d, 0x5d, 0x3b, 0x81, 0xe1, 0xe1, 0x50,
0x68, 0x68, 0x88, 0xb1, 0x81, 0x81, 0xbe, 0xbe,
0x40, 0xa0, 0xfa, 0x0d, 0x05, 0x61, 0x6a, 0x6a,
0x62, 0x02, 0x20, 0x95, 0x4a, 0xa5, 0x52, 0xa9,
0xc7, 0x8f, 0x57, 0x56, 0x96, 0x96, 0x3e, 0x7d,
0xda, 0xde, 0xbe, 0x76, 0x02, 0x5d, 0x5d, 0x4f,
0x9e, 0x3c, 0x7d, 0x0a, 0x90, 0x48, 0x24, 0x12,
0x89, 0x44, 0xf5, 0x1b, 0xef, 0xee, 0xee, 0xef,
0xef, 0xec, 0x00, 0x68, 0x9a, 0xa6, 0x69, 0x1a,
0x00, 0x63, 0x8c, 0x31, 0x56, 0x6e, 0x11, 0x4d,
0x4d, 0x8d, 0x8d, 0xcd, 0xcd, 0xcf, 0x9f, 0x4f,
0x4e, 0x0a, 0xc2, 0xd4, 0xd4, 0xbb, 0x77, 0x57,
0x3d, 0xc7, 0xe5, 0x34, 0xe1, 0xf7, 0xfb, 0xfd,
0x0f, 0x1f, 0x02, 0x10, 0x42, 0x08, 0xcf, 0x57,
0x4f, 0xa0, 0xad, 0xad, 0xad, 0xed, 0xfe, 0x7d,
0xe7, 0x79, 0x42, 0x08, 0x21, 0x04, 0x80, 0xe7,
0x79, 0x9e, 0xe7, 0x01, 0x16, 0x17, 0x97, 0x97,
0x17, 0x16, 0xde, 0xbe, 0x0d, 0x06, 0x83, 0xc1,
0x60, 0x70, 0x72, 0x52, 0x10, 0x04, 0x41, 0x10,
0x44, 0xb1, 0x6a, 0x05, 0x06, 0x07, 0x83, 0xc1,
0x40, 0x80, 0xb1, 0x9e, 0x9e, 0xee, 0xee, 0xde,
0x5e, 0x80, 0xcf, 0x9f, 0x63, 0x31, 0xc6, 0x00,
0xf6, 0xf6, 0x7e, 0xfe, 0xac, 0x9e, 0xc6, 0xff,
0x83, 0xdb, 0xad, 0x69, 0x67, 0x67, 0x6f, 0xde,
0x6c, 0x6c, 0xcc, 0xce, 0x86, 0x42, 0x63, 0x63,
0x18, 0x77, 0x54, 0xa0, 0xa3, 0xa3, 0xa3, 0xe3,
0xd1, 0x23, 0x80, 0x0f, 0x1f, 0xbe, 0x7c, 0x09,
0x87, 0x01, 0x5e, 0xbc, 0xe8, 0xef, 0xef, 0xe9,
0x01, 0x90, 0x65, 0x4d, 0x33, 0x8c, 0xeb, 0x27,
0xf0, 0xfe, 0xfd, 0xdc, 0xdc, 0xfa, 0xfa, 0xcb,
0x97, 0xa6, 0x77, 0x05, 0x02, 0x07, 0x07, 0x07,
0x07, 0x91, 0x88, 0xe5, 0xa7, 0xd3, 0xf9, 0xbc,
0xaa, 0x02, 0x24, 0x93, 0xd9, 0xac, 0xa2, 0x5c,
0x5f, 0xe2, 0xed, 0xed, 0xcd, 0xcd, 0x75, 0x75,
0xce, 0xf3, 0xc4, 0x1e, 0x90, 0x65, 0x59, 0x96,
0x65, 0x4b, 0x81, 0x9b, 0x46, 0xa1, 0xa0, 0xaa,
0x7f, 0x53, 0x9c, 0x38, 0x4d, 0xd8, 0x15, 0xb8,
0xad, 0x28, 0x23, 0x20, 0x49, 0x92, 0x24, 0x49,
0xb7, 0x49, 0x81, 0x42, 0xa1, 0x50, 0x40, 0xef,
0xe8, 0xe8, 0x52, 0x02, 0x88, 0xdb, 0xa2, 0x40,
0x26, 0x93, 0xc9, 0x64, 0x32, 0x00, 0x84, 0xe8,
0x7a, 0x36, 0x9b, 0xcb, 0x5d, 0x99, 0x80, 0x5d,
0x01, 0xaf, 0xb7, 0xa6, 0xa6, 0x52, 0x3f, 0xc0,
0x66, 0x54, 0xdc, 0xa0, 0x00, 0x00, 0x28, 0x35,
0x47, 0x94, 0x52, 0x6a, 0xfa, 0x94, 0xa2, 0xcf,
0x18, 0x80, 0x61, 0x94, 0x5a, 0x5d, 0xaf, 0x6c,
0x25, 0x49, 0x96, 0x15, 0x05, 0x80, 0x10, 0xc6,
0x0c, 0x23, 0x16, 0xb3, 0x9f, 0x6f, 0xfb, 0x0a,
0x71, 0x7f, 0xfa, 0x82, 0x5d, 0x01, 0x5d, 0x37,
0x0c, 0x4a, 0x01, 0x14, 0x45, 0xd7, 0xcd, 0x94,
0xcc, 0x44, 0x8b, 0x09, 0xe0, 0x0e, 0x26, 0x11,
0xdc, 0xcb, 0xea, 0xb8, 0x66, 0x1c, 0x4f, 0xc1,
0x28, 0xc7, 0xe1, 0x4e, 0xd6, 0x5a, 0x80, 0xfa,
0x7a, 0x8f, 0xc7, 0xe5, 0x02, 0x38, 0x3d, 0x4d,
0xa7, 0xd3, 0x69, 0x4d, 0x23, 0xc4, 0x30, 0x24,
0x29, 0x9f, 0xbf, 0xa8, 0xfb, 0x45, 0xe1, 0x29,
0x75, 0x24, 0x80, 0x0a, 0x74, 0x76, 0x46, 0xa3,
0x9b, 0x9b, 0x00, 0x84, 0xf0, 0x3c, 0x21, 0x00,
0x8a, 0xa2, 0x69, 0x94, 0x16, 0xa7, 0x65, 0x25,
0x5a, 0x9c, 0xd6, 0x65, 0x09, 0x16, 0x13, 0xaa,
0xa4, 0x69, 0x63, 0xa3, 0xcf, 0x47, 0x08, 0xc0,
0xc9, 0xc9, 0xaf, 0x5f, 0xd9, 0x2c, 0xc7, 0x11,
0x22, 0xcb, 0xc9, 0xe4, 0xda, 0xda, 0x45, 0xdd,
0x2f, 0xf2, 0x56, 0x55, 0x1b, 0x01, 0xb7, 0x1b,
0x47, 0x91, 0xc8, 0xd7, 0xaf, 0xd1, 0x28, 0x40,
0x43, 0xc3, 0xbd, 0x7b, 0x2d, 0x2d, 0x00, 0x89,
0xc4, 0xf9, 0xb9, 0xa2, 0x00, 0xc8, 0x72, 0xa9,
0x02, 0xf6, 0x74, 0xcb, 0x89, 0x38, 0x8d, 0xad,
0x51, 0x71, 0x09, 0x7c, 0x3e, 0xaf, 0xd7, 0xe5,
0xb2, 0x0a, 0x95, 0x4c, 0x9e, 0x9f, 0x8b, 0xa2,
0x61, 0xb8, 0x5c, 0x67, 0x67, 0x5b, 0x5b, 0xb8,
0xa2, 0xa6, 0xc6, 0x81, 0x80, 0xd5, 0x32, 0x3c,
0x9e, 0xd6, 0x56, 0xbf, 0x1f, 0xe0, 0xc1, 0x03,
0x9f, 0x8f, 0xe7, 0x01, 0xa2, 0xd1, 0x78, 0x3c,
0x9f, 0xb7, 0x0e, 0x33, 0x49, 0x54, 0xa6, 0x60,
0x8f, 0x97, 0xbe, 0x3a, 0xc5, 0xda, 0x98, 0xe3,
0xe2, 0x82, 0xd4, 0xd6, 0xba, 0xdd, 0x94, 0x02,
0xfc, 0xf8, 0x71, 0x74, 0x74, 0x78, 0xc8, 0x98,
0x28, 0x8a, 0x62, 0x3e, 0x2f, 0x8a, 0xdf, 0xbf,
0x47, 0xa3, 0xb1, 0x18, 0x5e, 0x62, 0xaf, 0xd7,
0xb4, 0xb9, 0x9c, 0x8d, 0x40, 0xa1, 0x10, 0x0e,
0x87, 0xc3, 0x91, 0x48, 0x20, 0xf0, 0xed, 0xdb,
0xfc, 0xfc, 0xde, 0xde, 0xf4, 0x34, 0xdc, 0x28,
0x38, 0x2e, 0x97, 0x3b, 0x3c, 0x5c, 0x5d, 0x1d,
0x1f, 0x8f, 0xc7, 0x8f, 0x8f, 0xe3, 0xf1, 0xe3,
0xe3, 0xb2, 0x27, 0x4a, 0x5d, 0xfc, 0xce, 0x78,
0x3c, 0xa6, 0xf5, 0xf9, 0x4a, 0x19, 0x63, 0x1c,
0x25, 0xc4, 0xcb, 0x84, 0xb5, 0xb5, 0xd7, 0xb8,
0x3c, 0xa1, 0xca, 0xcf, 0xa1, 0xc5, 0x9e, 0x8b,
0x16, 0xff, 0x2a, 0xa1, 0xc5, 0x8e, 0x90, 0xcd,
0xa2, 0xcf, 0x55, 0x3e, 0x00, 0x89, 0xe0, 0x65,
0x41, 0x8b, 0x77, 0xc4, 0x9e, 0xb8, 0x7d, 0xbd,
0x9d, 0x80, 0xd3, 0x73, 0x08, 0x7c, 0x21, 0x71,
0x1d, 0xfa, 0xba, 0x5e, 0xd9, 0xe2, 0xfc, 0x4d,
0xfc, 0xac, 0xbc, 0x43, 0x29, 0x7e, 0x03, 0xc4,
0x0c, 0x3e, 0x03, 0x1d, 0xa3, 0x8f, 0xcb, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};

251
art/tango/folder_new.h Normal file
View File

@@ -0,0 +1,251 @@
/* folder_new.png - 635 bytes */
static const unsigned char folder_new_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0b, 0x11, 0x0f, 0x07, 0x00, 0x55,
0x4f, 0xf7, 0x2d, 0x00, 0x00, 0x02, 0x08, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x90, 0x3d,
0x68, 0x53, 0x61, 0x14, 0x86, 0x9f, 0xef, 0xf6,
0xde, 0x96, 0x7b, 0x53, 0x49, 0xdb, 0xb4, 0x24,
0xa4, 0xb5, 0x0a, 0x56, 0x5c, 0x15, 0x07, 0x15,
0xfc, 0x9d, 0xc4, 0xc9, 0x4a, 0x14, 0x45, 0x07,
0x15, 0x17, 0x41, 0xc4, 0xc1, 0x4d, 0x10, 0x5d,
0x9d, 0x04, 0x11, 0x41, 0x50, 0x5b, 0x27, 0x11,
0x71, 0x70, 0xb2, 0x45, 0xb0, 0x95, 0x2e, 0xba,
0xd4, 0x40, 0x25, 0x0e, 0x2d, 0x41, 0x2d, 0x42,
0xdb, 0x68, 0xab, 0x21, 0xbd, 0xf7, 0xe6, 0xbb,
0x3f, 0xc7, 0x21, 0x21, 0xad, 0xa5, 0x41, 0xc5,
0x87, 0x0f, 0xbe, 0xe1, 0x9c, 0xf3, 0x9e, 0xf7,
0xbc, 0xea, 0xc4, 0xc9, 0xdc, 0x8d, 0x4c, 0x26,
0x73, 0x93, 0x35, 0x68, 0xad, 0x6b, 0x7f, 0x55,
0x5f, 0x1c, 0x7a, 0xf4, 0xf8, 0x3e, 0x4d, 0x50,
0x97, 0xaf, 0x5c, 0x92, 0xf3, 0x67, 0x2f, 0xac,
0x5b, 0xf4, 0x7d, 0x8f, 0x87, 0x43, 0x0f, 0x28,
0x97, 0xcb, 0xa7, 0x9f, 0x3d, 0x7d, 0xfe, 0x24,
0x9c, 0x3f, 0xaa, 0x00, 0x0b, 0x08, 0xcc, 0xf4,
0x0b, 0x69, 0x08, 0xe4, 0x8e, 0x1d, 0xa7, 0xf0,
0xb1, 0xd0, 0x6c, 0x09, 0x63, 0xe3, 0xaf, 0x69,
0x31, 0x84, 0xde, 0x0c, 0x0c, 0x6c, 0x16, 0xfa,
0x32, 0x32, 0x76, 0xe4, 0xa0, 0x5c, 0x07, 0xde,
0x9b, 0x00, 0xb6, 0xed, 0xd0, 0x91, 0xec, 0x6c,
0x2a, 0x90, 0x1b, 0x1c, 0xa4, 0xbb, 0xe3, 0x1b,
0x03, 0x1b, 0x67, 0xe9, 0x48, 0xf5, 0x10, 0x84,
0xd6, 0xa1, 0xd8, 0x28, 0xde, 0x55, 0xf1, 0xdc,
0x6d, 0x53, 0x6b, 0x8d, 0xe7, 0xb9, 0xbc, 0xfa,
0x50, 0x61, 0xaa, 0xe4, 0xac, 0x33, 0x2e, 0x0c,
0xa4, 0x7f, 0x72, 0x66, 0x5f, 0x11, 0xab, 0xbd,
0x17, 0xc3, 0x3e, 0x85, 0x63, 0x76, 0xb1, 0xec,
0x4d, 0x6c, 0x2f, 0x7e, 0x1e, 0xbd, 0xd7, 0x70,
0x30, 0x55, 0x72, 0xb8, 0x73, 0xf5, 0x30, 0xbe,
0x8e, 0x7e, 0x0f, 0x89, 0x90, 0x64, 0xeb, 0x34,
0x59, 0xbb, 0x84, 0xed, 0x64, 0x69, 0x31, 0x53,
0x28, 0x65, 0x60, 0x99, 0x36, 0xa1, 0x48, 0xc2,
0x04, 0xf0, 0x3c, 0x17, 0x80, 0xb9, 0x25, 0x9f,
0xe2, 0xc2, 0xf2, 0x1a, 0x81, 0x98, 0x94, 0x03,
0x41, 0xf7, 0x06, 0xb2, 0xd1, 0x34, 0xed, 0x6a,
0x02, 0xcb, 0xda, 0x46, 0xa8, 0x27, 0x29, 0xce,
0xb5, 0x62, 0xfa, 0xbe, 0x8f, 0x6d, 0x3b, 0x4d,
0xef, 0x17, 0x0c, 0x96, 0xbc, 0x1e, 0x0a, 0xa5,
0x9d, 0x54, 0xf4, 0x0c, 0xfd, 0xfa, 0x2d, 0x76,
0x5b, 0x1e, 0x37, 0x48, 0x30, 0x92, 0xef, 0xc7,
0x74, 0x5d, 0xb7, 0xe1, 0xa0, 0x19, 0x91, 0x98,
0x7c, 0xf7, 0xd2, 0x54, 0x74, 0x92, 0xd9, 0xf2,
0x16, 0xda, 0x5a, 0x7c, 0x92, 0xed, 0x7d, 0xcc,
0xcc, 0x4f, 0xd2, 0xc8, 0xe0, 0xcf, 0x18, 0x54,
0x23, 0x87, 0xaa, 0x5b, 0xeb, 0x6d, 0xb3, 0x6d,
0xaa, 0x81, 0x89, 0xb1, 0x3a, 0x83, 0xbf, 0x25,
0x8a, 0x62, 0xfc, 0x40, 0x00, 0x56, 0x1c, 0x58,
0x46, 0x8c, 0x00, 0x22, 0x82, 0x52, 0x0a, 0x11,
0x41, 0x04, 0x62, 0x11, 0xa2, 0x48, 0x08, 0xa2,
0x18, 0x1d, 0x0a, 0xd5, 0x30, 0x22, 0x88, 0x84,
0x64, 0xa2, 0x75, 0x45, 0xc0, 0xf3, 0x5c, 0x36,
0x25, 0xab, 0x2c, 0x56, 0x34, 0x5f, 0x17, 0x3d,
0x10, 0x45, 0x8c, 0x50, 0x7f, 0x88, 0x80, 0x20,
0x88, 0xd4, 0x85, 0x81, 0x30, 0x5a, 0xe5, 0x60,
0xbe, 0xb4, 0xc0, 0x8e, 0x3d, 0x7b, 0xc9, 0x7f,
0xfa, 0x51, 0x1f, 0xaa, 0x6d, 0x17, 0x81, 0x18,
0x41, 0x50, 0x20, 0xd2, 0x70, 0xb5, 0x6b, 0x6b,
0x17, 0xa3, 0x2f, 0x47, 0xe8, 0xf4, 0x67, 0x87,
0xd5, 0xfe, 0x73, 0xb7, 0xc6, 0x5d, 0xab, 0xf7,
0x00, 0xff, 0x48, 0x22, 0xf8, 0xf2, 0xee, 0xcd,
0xf0, 0xb5, 0xdd, 0xfc, 0x2f, 0xbf, 0x00, 0x5c,
0xb6, 0xf8, 0x8a, 0x37, 0xe1, 0x9a, 0xa9, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};
/* folder_new.png - 1316 bytes */
static const unsigned char folder_new_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
0xaf, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x4b, 0x6b, 0x53, 0x4d, 0x18, 0x7e, 0xce,
0x9c, 0x49, 0x9a, 0xc4, 0xa6, 0x37, 0x6d, 0x4b,
0x2b, 0x54, 0x21, 0x42, 0xa1, 0xd6, 0x85, 0xa6,
0x20, 0x16, 0x44, 0xff, 0x81, 0x3b, 0x29, 0xb8,
0xf2, 0xd2, 0x95, 0x48, 0xed, 0x5a, 0x28, 0xf8,
0x07, 0xcc, 0x4a, 0x44, 0x8b, 0x3b, 0x37, 0x41,
0x5c, 0xe8, 0x46, 0x57, 0x2a, 0x64, 0x21, 0x28,
0xd6, 0xda, 0x1b, 0x49, 0xeb, 0x05, 0x69, 0x6d,
0x4e, 0x92, 0xe6, 0xd2, 0x5c, 0x4e, 0x4e, 0xce,
0x65, 0xe6, 0x5b, 0x9c, 0x4e, 0x93, 0x9e, 0x24,
0xf4, 0x8b, 0x97, 0xef, 0xdb, 0xf4, 0xdd, 0xbc,
0xf3, 0xce, 0x9c, 0x79, 0xe7, 0x79, 0xde, 0x4b,
0x66, 0x02, 0x1c, 0xc8, 0x81, 0xfc, 0x96, 0x48,
0xce, 0x89, 0xdb, 0xb7, 0xa7, 0xa7, 0xa7, 0xa6,
0xee, 0xde, 0xb5, 0x2c, 0xc6, 0x4c, 0x73, 0x66,
0x66, 0x3f, 0x07, 0xba, 0xae, 0xeb, 0xba, 0x5e,
0xb5, 0x19, 0xb3, 0x2c, 0xc6, 0x26, 0x26, 0x66,
0x67, 0x1f, 0x3d, 0x7a, 0xfc, 0x38, 0x1c, 0xfe,
0xcf, 0x09, 0xdc, 0xba, 0x35, 0x35, 0x75, 0xf3,
0x26, 0xe7, 0xd7, 0xaf, 0x5f, 0xbd, 0x3a, 0x39,
0xd9, 0xba, 0xc3, 0x07, 0x0f, 0x1e, 0x3e, 0xbc,
0x7f, 0x1f, 0xc8, 0x64, 0x32, 0x99, 0x4c, 0x66,
0x6c, 0xec, 0xe9, 0xd3, 0x70, 0xf8, 0xd9, 0xb3,
0x8f, 0x1f, 0xf7, 0xdb, 0x67, 0x9a, 0x89, 0xc4,
0xa5, 0x4b, 0xd2, 0x0e, 0x1e, 0x97, 0xcb, 0xd6,
0x86, 0x41, 0x69, 0x7f, 0xff, 0xf3, 0xe7, 0x9c,
0xb7, 0x4c, 0xe0, 0xdc, 0xb9, 0xb3, 0x67, 0xc7,
0xc7, 0x01, 0x45, 0x51, 0x14, 0x45, 0x69, 0x9d,
0xc8, 0xa7, 0x4f, 0x9f, 0x3f, 0xcf, 0xcd, 0x01,
0x86, 0x61, 0x18, 0x86, 0x01, 0x70, 0xce, 0x39,
0xe7, 0xf5, 0x5a, 0x96, 0x09, 0xe1, 0x1c, 0xb8,
0x78, 0x71, 0x7c, 0xdc, 0xef, 0x0f, 0x85, 0x6e,
0xdc, 0xb8, 0x7c, 0x39, 0x97, 0x8b, 0x46, 0x6d,
0x2f, 0x6e, 0xb7, 0xf0, 0x26, 0xb4, 0x4d, 0x48,
0x55, 0xc5, 0x39, 0xb4, 0x19, 0x80, 0x91, 0x91,
0x91, 0x91, 0x93, 0x27, 0x01, 0x42, 0x08, 0x91,
0xe5, 0xd6, 0x09, 0x0c, 0x0e, 0x0e, 0x0e, 0x1e,
0x3d, 0xda, 0x7c, 0x5d, 0x96, 0x65, 0x99, 0x73,
0xa0, 0xaf, 0xaf, 0xbb, 0x3b, 0x9d, 0x06, 0x5c,
0x2e, 0xc6, 0x22, 0x91, 0xe9, 0x69, 0x5d, 0x97,
0xe5, 0xb1, 0xb1, 0x54, 0x0a, 0x90, 0xa4, 0x8e,
0x0e, 0x4a, 0x29, 0x65, 0x2c, 0x16, 0xfb, 0xf1,
0x43, 0x92, 0x18, 0x53, 0x94, 0x50, 0xc8, 0xce,
0x54, 0x38, 0x6c, 0x13, 0xa9, 0x54, 0xea, 0x08,
0x88, 0x9a, 0x5e, 0x59, 0x59, 0x59, 0x59, 0x5e,
0x06, 0x5e, 0xbf, 0x5e, 0x5d, 0xe5, 0x1c, 0x98,
0x9f, 0xff, 0xf9, 0xb3, 0x75, 0x1a, 0x8d, 0x85,
0x73, 0xe0, 0xc4, 0x89, 0xfe, 0xfe, 0xed, 0x6d,
0xe0, 0xca, 0x95, 0xf3, 0xe7, 0x63, 0x31, 0xe0,
0xcc, 0x99, 0xe1, 0xe1, 0xd3, 0xa7, 0x01, 0xd3,
0xa4, 0x74, 0x62, 0xa2, 0xb7, 0x57, 0x96, 0x29,
0xed, 0xe9, 0x01, 0x4a, 0xa5, 0x72, 0x39, 0x12,
0xe9, 0xee, 0x4e, 0x26, 0x13, 0x89, 0x17, 0x2f,
0x66, 0x66, 0x02, 0x81, 0xfe, 0x7e, 0x45, 0x11,
0x25, 0xb9, 0xbc, 0xdc, 0x34, 0x03, 0xa3, 0xa3,
0xa3, 0xa3, 0xa7, 0x4e, 0x01, 0xf7, 0xee, 0xbd,
0x79, 0xb3, 0xb0, 0x00, 0xdc, 0xb9, 0x73, 0xed,
0xda, 0x85, 0x0b, 0x80, 0xa6, 0x19, 0x86, 0x65,
0xfd, 0x3a, 0x78, 0x42, 0x00, 0xd3, 0x04, 0x8e,
0x1c, 0xf1, 0xf9, 0xbe, 0x7e, 0x05, 0x02, 0x81,
0xae, 0x2e, 0x45, 0x01, 0x7c, 0x3e, 0xaf, 0x77,
0x60, 0x00, 0x90, 0x65, 0x4a, 0x0f, 0x1f, 0x06,
0x24, 0x49, 0x92, 0x08, 0x01, 0x28, 0x95, 0x65,
0xaf, 0x17, 0xc8, 0xe5, 0xca, 0x65, 0xb7, 0x3b,
0x10, 0xb0, 0xbd, 0x74, 0x76, 0x0a, 0x7f, 0x4d,
0x09, 0x2c, 0x2d, 0x2d, 0x2d, 0x2d, 0x2e, 0x56,
0xed, 0x6c, 0xb6, 0x54, 0xd2, 0x75, 0x20, 0x95,
0xca, 0xe7, 0x2b, 0x95, 0x5f, 0x27, 0x20, 0x49,
0x00, 0x63, 0x40, 0xb1, 0xe8, 0xf3, 0x51, 0x0a,
0x1c, 0x3a, 0x44, 0x48, 0x67, 0x27, 0x40, 0x88,
0x24, 0xad, 0xad, 0x01, 0x7e, 0xbf, 0x2c, 0x47,
0x22, 0x80, 0xcb, 0xe5, 0x72, 0x0d, 0x0f, 0x03,
0xa6, 0x69, 0x18, 0x73, 0x73, 0xc0, 0xb7, 0x6f,
0x8a, 0xe2, 0x76, 0x03, 0xc1, 0xe0, 0xf1, 0xe3,
0x40, 0x26, 0xb3, 0x1b, 0x10, 0xe7, 0x01, 0x9a,
0xa6, 0x69, 0x9a, 0x56, 0xcd, 0xc0, 0x9f, 0x16,
0xce, 0xed, 0x2c, 0x64, 0xb3, 0xe5, 0x72, 0x6f,
0x2f, 0xb0, 0xbc, 0x9c, 0x4c, 0x06, 0x83, 0x40,
0x2c, 0x96, 0x4a, 0x0d, 0x0d, 0x01, 0xa9, 0xd4,
0xd6, 0xd6, 0xbb, 0x77, 0x40, 0x2e, 0x97, 0xc9,
0x84, 0xc3, 0xc0, 0xc6, 0x46, 0x3a, 0x4d, 0x08,
0xf0, 0xea, 0xd5, 0xfc, 0xfc, 0xd0, 0x90, 0xf0,
0xb2, 0xb9, 0xd9, 0x72, 0x06, 0xfe, 0xb4, 0x58,
0x16, 0xe7, 0x94, 0x02, 0x5b, 0x5b, 0xaa, 0xda,
0xd7, 0x07, 0x14, 0x8b, 0xba, 0xde, 0xd1, 0x01,
0xac, 0xaf, 0xe7, 0x72, 0x81, 0x00, 0xd0, 0xd6,
0x46, 0x69, 0xb9, 0x6c, 0x97, 0xd4, 0xc0, 0x00,
0xf0, 0xe5, 0x4b, 0x22, 0x51, 0xc5, 0x53, 0x28,
0x34, 0x25, 0xa0, 0xaa, 0xaa, 0xaa, 0xaa, 0xb5,
0x19, 0xb0, 0x7b, 0xe0, 0x6f, 0x0a, 0x21, 0x80,
0xa6, 0x99, 0xa6, 0xcf, 0x57, 0xd5, 0x42, 0xda,
0xdb, 0x5d, 0x2e, 0xd3, 0x04, 0x2a, 0x15, 0xc3,
0xa0, 0x74, 0x6d, 0xcd, 0x79, 0x2f, 0x90, 0x66,
0x4e, 0xff, 0x76, 0x06, 0xfe, 0xad, 0x6c, 0x6f,
0x6f, 0x6f, 0x17, 0x0a, 0x00, 0x21, 0xa6, 0x99,
0xcf, 0x17, 0x8b, 0x75, 0xe4, 0x9b, 0x6d, 0x74,
0xf6, 0x80, 0xd7, 0xeb, 0x76, 0x37, 0xba, 0x0f,
0x44, 0x2c, 0x6a, 0x2f, 0x28, 0x00, 0x60, 0xcc,
0x1e, 0x31, 0xc6, 0x98, 0x6d, 0x33, 0x26, 0x6c,
0xce, 0x01, 0xcb, 0xda, 0xab, 0x4d, 0xb3, 0xb1,
0x56, 0x55, 0x4d, 0xab, 0x54, 0x00, 0x42, 0x38,
0xb7, 0xac, 0xd5, 0x55, 0xe7, 0xf9, 0x8e, 0x12,
0x92, 0x76, 0x6f, 0x66, 0x67, 0x06, 0x4c, 0xd3,
0xb2, 0x18, 0x03, 0x2a, 0x15, 0xd3, 0xb4, 0x21,
0xd9, 0x40, 0x6b, 0x09, 0x08, 0x0f, 0x36, 0x11,
0xe1, 0x4b, 0xac, 0x88, 0x79, 0x71, 0x8a, 0x98,
0x95, 0x24, 0xe1, 0xa9, 0xba, 0x17, 0x68, 0x6f,
0xf7, 0x78, 0x28, 0x05, 0x92, 0xc9, 0x6c, 0x36,
0x9b, 0x35, 0x0c, 0x42, 0x2c, 0x4b, 0x55, 0x4b,
0xa5, 0x9d, 0xb8, 0xef, 0x04, 0x9e, 0xb1, 0xa6,
0x04, 0x44, 0x06, 0x82, 0xc1, 0x68, 0xf4, 0xfd,
0x7b, 0x80, 0x10, 0x59, 0x26, 0xc4, 0xae, 0x45,
0xc6, 0x6a, 0x61, 0x55, 0x81, 0xd6, 0xc2, 0xda,
0x0f, 0x60, 0x2d, 0xa1, 0x46, 0x39, 0xed, 0xe9,
0xf1, 0xfb, 0x09, 0x01, 0x12, 0x89, 0xad, 0xad,
0x7c, 0x5e, 0x92, 0x08, 0xd1, 0xb4, 0x54, 0xea,
0xed, 0xdb, 0x9d, 0xb8, 0xef, 0xe0, 0xd6, 0x75,
0x07, 0x01, 0xf1, 0x88, 0x02, 0x16, 0x17, 0x57,
0x56, 0xa2, 0x51, 0xa0, 0xa3, 0xa3, 0xab, 0xab,
0xaf, 0x0f, 0x50, 0x94, 0x5c, 0xae, 0x52, 0xb1,
0x9b, 0xac, 0x36, 0x03, 0x4e, 0xb8, 0xf5, 0x44,
0x9a, 0x8d, 0xab, 0xa3, 0xda, 0x10, 0xf8, 0xfd,
0x5e, 0x2f, 0xa5, 0xd5, 0x40, 0xa5, 0x52, 0xb9,
0x5c, 0xa1, 0x60, 0x59, 0x94, 0xa6, 0xd3, 0x1f,
0x3e, 0x88, 0x1d, 0xe2, 0x8d, 0x54, 0x47, 0xa0,
0xda, 0xff, 0x1e, 0xcf, 0xc0, 0xc0, 0xc8, 0x08,
0x70, 0xec, 0x98, 0xdf, 0x2f, 0xcb, 0x40, 0x34,
0x1a, 0x8f, 0x97, 0x4a, 0xd5, 0xc3, 0x6c, 0x12,
0x8d, 0x29, 0x38, 0xe7, 0xf7, 0x96, 0x4e, 0x6d,
0x6e, 0xec, 0x71, 0x6d, 0x40, 0xda, 0xda, 0x5c,
0x2e, 0xc6, 0x80, 0x8d, 0x8d, 0xb5, 0xb5, 0x58,
0x8c, 0xf3, 0x42, 0xa1, 0x50, 0x28, 0x95, 0x0a,
0x85, 0xf5, 0xf5, 0x68, 0x74, 0x75, 0x55, 0x34,
0xb1, 0xd7, 0x6b, 0xeb, 0x62, 0xd1, 0x41, 0xa0,
0x5c, 0x5e, 0x58, 0x58, 0x58, 0x58, 0x5c, 0x9c,
0x9c, 0xfc, 0xfe, 0xfd, 0xc9, 0x93, 0xf9, 0xf9,
0xd9, 0x59, 0xfc, 0xaf, 0x22, 0x49, 0xc5, 0x62,
0x2c, 0xf6, 0xf2, 0x65, 0x28, 0x14, 0x8f, 0x6f,
0x6e, 0xc6, 0xe3, 0xd5, 0x0b, 0x6c, 0xf7, 0x8b,
0xbd, 0xa6, 0xf8, 0x9d, 0xf1, 0x78, 0x6c, 0xed,
0xf7, 0xef, 0x65, 0x2c, 0xe6, 0x45, 0x0a, 0x45,
0x33, 0x89, 0xd8, 0x3a, 0x63, 0x5c, 0x0f, 0xa8,
0xf1, 0x77, 0x42, 0x8b, 0x57, 0x96, 0xd0, 0xe2,
0xaf, 0x92, 0xd0, 0xe5, 0xb2, 0xad, 0xf3, 0x79,
0x61, 0x4b, 0x8d, 0x0f, 0x10, 0x44, 0x44, 0xb3,
0x08, 0x2d, 0x7a, 0xc4, 0x09, 0xdc, 0xb9, 0xdf,
0x49, 0xa0, 0xd9, 0x77, 0x42, 0x44, 0x41, 0x8a,
0x7d, 0xc2, 0x36, 0xcd, 0xc6, 0x5a, 0xac, 0xff,
0xce, 0xb3, 0xf2, 0x40, 0xfe, 0x8c, 0xfc, 0x03,
0x43, 0x77, 0xd7, 0xb0, 0xfa, 0xd8, 0xe9, 0xe0,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xae, 0x42, 0x60, 0x82};

230
art/tango/folder_open.h Normal file
View File

@@ -0,0 +1,230 @@
/* folder_open.png - 523 bytes */
static const unsigned char folder_open_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0b, 0x0a, 0x13, 0x00, 0x30, 0xae,
0xf3, 0xdb, 0xcc, 0x00, 0x00, 0x01, 0x98, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xa5, 0x91, 0x4d,
0x4b, 0x5b, 0x41, 0x18, 0x85, 0x9f, 0x91, 0xd4,
0x92, 0x08, 0xa6, 0x29, 0x28, 0xb1, 0x4a, 0xc1,
0xd2, 0x2e, 0x5d, 0x08, 0x42, 0x2d, 0x94, 0xe6,
0x27, 0x94, 0x60, 0x55, 0x70, 0xe3, 0x47, 0x29,
0x48, 0xab, 0xa8, 0x5b, 0xbb, 0x68, 0xb7, 0xdd,
0xb9, 0x12, 0x84, 0x1a, 0x75, 0x55, 0x24, 0x04,
0x97, 0xea, 0xc2, 0x6a, 0x57, 0xe2, 0x42, 0x97,
0xba, 0x13, 0xf1, 0xa3, 0xa0, 0x12, 0x35, 0x29,
0xe6, 0xde, 0x3b, 0xb9, 0x73, 0x5f, 0x17, 0x37,
0x5a, 0x12, 0x12, 0xd4, 0xf6, 0x30, 0x30, 0x30,
0xc3, 0xfb, 0x9c, 0x33, 0x67, 0x54, 0x67, 0x77,
0xc7, 0x97, 0x68, 0x34, 0xfa, 0x95, 0x12, 0x69,
0xad, 0xfd, 0xdd, 0xd1, 0x83, 0x33, 0x89, 0xb9,
0x29, 0x2a, 0x48, 0x0d, 0x8f, 0x7c, 0x92, 0xfe,
0xde, 0xf7, 0x65, 0x2f, 0x6d, 0xdb, 0x62, 0x7a,
0xe6, 0x3b, 0xd9, 0x6c, 0xb6, 0x27, 0x39, 0x9f,
0xfa, 0x51, 0x16, 0xf0, 0x71, 0x68, 0x50, 0xba,
0xde, 0x75, 0xb3, 0xbd, 0xb3, 0x5d, 0xc9, 0x84,
0xd5, 0xb5, 0x9f, 0xa5, 0x47, 0x13, 0xc9, 0xf9,
0xd4, 0x18, 0x40, 0xc0, 0x18, 0x43, 0x30, 0x18,
0xe2, 0x51, 0x38, 0x52, 0x11, 0x10, 0x7f, 0xdb,
0xe1, 0xbb, 0x29, 0x85, 0x52, 0x8a, 0xd4, 0x42,
0x72, 0x14, 0xf0, 0x01, 0x5a, 0x6b, 0x2c, 0x2b,
0xc7, 0x45, 0xe6, 0x9c, 0x7f, 0x51, 0xc0, 0x75,
0xdd, 0x5b, 0x13, 0xdc, 0xbc, 0xb7, 0x90, 0xa0,
0x08, 0x00, 0xdc, 0x24, 0x48, 0x6c, 0x85, 0xef,
0x66, 0x5b, 0x1b, 0xa7, 0xed, 0x43, 0x5c, 0xc2,
0xd5, 0x4e, 0x69, 0x02, 0x8f, 0xf1, 0x81, 0x18,
0x25, 0x26, 0x65, 0x15, 0x7a, 0x18, 0xe0, 0xf3,
0xe4, 0x8a, 0x0f, 0xb8, 0x4e, 0xf0, 0xa4, 0xae,
0x09, 0xc7, 0x35, 0x1c, 0x9d, 0xd9, 0xb7, 0x02,
0x9e, 0xd5, 0xd7, 0x00, 0x50, 0x05, 0x10, 0x0c,
0x86, 0xf8, 0x6d, 0x85, 0xa9, 0x0d, 0x55, 0xdf,
0xbb, 0xc4, 0xaa, 0xeb, 0x0e, 0x32, 0x16, 0x34,
0x37, 0xdc, 0xad, 0x03, 0x63, 0x3c, 0xec, 0xbc,
0x29, 0x4e, 0xb0, 0xbe, 0x07, 0x6d, 0x2d, 0x4f,
0x39, 0x4c, 0x5b, 0x00, 0x88, 0x08, 0x9e, 0x27,
0xb8, 0xc6, 0xc3, 0xc9, 0x1b, 0x2e, 0x6d, 0x97,
0x8b, 0x4b, 0xcd, 0x49, 0xc6, 0xe6, 0x38, 0xe3,
0x90, 0x73, 0x4c, 0xf1, 0x2f, 0x3c, 0x8f, 0x58,
0xa4, 0xff, 0x68, 0x8e, 0xce, 0x2c, 0x10, 0x85,
0x87, 0x50, 0x58, 0x88, 0x80, 0x20, 0x88, 0x28,
0x44, 0x04, 0x01, 0xec, 0xbc, 0xf7, 0x17, 0x70,
0x7c, 0x7a, 0x42, 0xeb, 0xab, 0xd7, 0x6c, 0xee,
0x9e, 0x17, 0x86, 0xc4, 0x1f, 0x12, 0xf0, 0x10,
0x04, 0x05, 0x22, 0xfe, 0xb0, 0xc0, 0xcb, 0x17,
0x8f, 0x59, 0x5e, 0x5c, 0x22, 0x62, 0x1f, 0xcc,
0xaa, 0x37, 0x7d, 0xdf, 0xd6, 0x72, 0x0f, 0x1a,
0x63, 0xf7, 0x2d, 0xaf, 0x26, 0xbf, 0xbf, 0xf1,
0x6b, 0x76, 0xbc, 0x9d, 0xff, 0xd5, 0x15, 0x26,
0x94, 0xc3, 0xfa, 0x0c, 0x4b, 0xb2, 0xef, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};
/* folder_open.png - 1261 bytes */
static const unsigned char folder_open_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
0x78, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0xcb, 0x6f, 0x12, 0x5f, 0x14, 0x3e, 0x03,
0x25, 0x8c, 0x3c, 0x4a, 0x6a, 0x91, 0x97, 0x10,
0x13, 0x4d, 0x5a, 0x1b, 0x5d, 0xf9, 0x68, 0x65,
0x63, 0xd7, 0xc6, 0x98, 0xa6, 0x31, 0x8d, 0x2b,
0x96, 0xc6, 0x95, 0x56, 0xa3, 0x3b, 0x13, 0x17,
0xfa, 0x07, 0x34, 0x71, 0xe1, 0xc6, 0x15, 0x31,
0x36, 0x41, 0xdb, 0x6e, 0x8c, 0x0b, 0x13, 0x4d,
0x34, 0x31, 0x56, 0x13, 0x41, 0x04, 0x86, 0x9a,
0x6a, 0x6a, 0xd1, 0x09, 0x30, 0x03, 0x0c, 0x32,
0x33, 0x3c, 0x86, 0x3b, 0x0f, 0x17, 0x93, 0x29,
0x30, 0x3f, 0x48, 0xa1, 0x55, 0x7f, 0x9b, 0x7e,
0x09, 0xdc, 0x3b, 0xe7, 0xde, 0xef, 0xde, 0xf3,
0x9d, 0x73, 0xee, 0x1d, 0x00, 0xd8, 0xc3, 0x1e,
0x76, 0x05, 0x4c, 0xeb, 0x84, 0x42, 0xa1, 0x50,
0x28, 0x74, 0xf2, 0xa4, 0x2c, 0x03, 0x48, 0xd2,
0xf3, 0xe7, 0x18, 0x86, 0x61, 0x06, 0xc3, 0xd6,
0x34, 0xac, 0xf5, 0xdd, 0x1d, 0x46, 0x23, 0x86,
0x19, 0x0c, 0x57, 0xaf, 0x86, 0xc3, 0xe1, 0x70,
0x38, 0xfc, 0xe4, 0xc9, 0x3f, 0x17, 0x30, 0x33,
0x33, 0x33, 0x73, 0xe1, 0x42, 0x34, 0x3a, 0x3f,
0x7f, 0xfd, 0xfa, 0x8d, 0x1b, 0x27, 0x4e, 0x0c,
0xba, 0xd0, 0xe2, 0x62, 0x24, 0xb2, 0xb2, 0x22,
0x08, 0x95, 0x4a, 0xb9, 0x9c, 0xcb, 0x4d, 0x4f,
0x3f, 0x7d, 0x1a, 0x89, 0x2c, 0x2f, 0x7f, 0xf8,
0xf0, 0xb7, 0x05, 0x0c, 0x69, 0x1d, 0x59, 0x06,
0x50, 0x14, 0x51, 0xe4, 0x79, 0x9e, 0xe7, 0x79,
0x80, 0x58, 0x2c, 0x1a, 0x8d, 0x46, 0xfb, 0x5f,
0xe8, 0xd0, 0x21, 0xbf, 0xdf, 0xe7, 0x33, 0x9b,
0x93, 0xc9, 0x5f, 0xbf, 0x28, 0xea, 0xd9, 0xb3,
0xb9, 0xb9, 0x4b, 0x97, 0x2e, 0x5e, 0x3c, 0x77,
0x4e, 0x15, 0x32, 0xc8, 0x4a, 0x3b, 0x16, 0x20,
0x49, 0xb2, 0x5c, 0xa9, 0x98, 0xcd, 0x38, 0xee,
0x70, 0x00, 0x8c, 0x8e, 0x8e, 0x8e, 0x3a, 0x9d,
0x83, 0x2f, 0x18, 0x0c, 0x9e, 0x39, 0x73, 0xf6,
0xec, 0x81, 0x03, 0xef, 0xde, 0xad, 0xae, 0xbe,
0x7e, 0xfd, 0xf1, 0xa3, 0x2a, 0xa4, 0x5f, 0xf6,
0xfd, 0xfb, 0xaa, 0xe0, 0xf9, 0xf9, 0x81, 0x05,
0x18, 0x0c, 0x46, 0x23, 0x86, 0x59, 0xad, 0xcd,
0x66, 0xa3, 0xc1, 0xb2, 0x08, 0xe1, 0x38, 0x8e,
0xe3, 0xb8, 0xc9, 0x94, 0xc9, 0x64, 0x32, 0x9b,
0x9b, 0x00, 0x18, 0x86, 0x61, 0xda, 0x49, 0xc0,
0x30, 0x00, 0x83, 0x41, 0x3d, 0x23, 0x9a, 0x55,
0x8f, 0x63, 0xc7, 0x26, 0x26, 0x8e, 0x1f, 0xef,
0x5f, 0x38, 0x41, 0xac, 0xad, 0xa5, 0x52, 0xd7,
0xae, 0xa9, 0x4f, 0x3b, 0x10, 0xa0, 0x3a, 0x9c,
0x48, 0xe4, 0x72, 0xf9, 0x7c, 0x36, 0x7b, 0xfa,
0xb4, 0xc5, 0xb2, 0x6f, 0x9f, 0xd5, 0x0a, 0xe0,
0x76, 0xbb, 0xdd, 0x1e, 0x0f, 0x80, 0x24, 0x49,
0x92, 0x24, 0x0d, 0x9e, 0x91, 0xed, 0xa0, 0x28,
0x8a, 0xa2, 0x28, 0x3b, 0xe7, 0x0f, 0x75, 0x3e,
0x7e, 0xff, 0x4e, 0xd3, 0x34, 0x4d, 0x51, 0x08,
0x1d, 0x3c, 0xe8, 0xf3, 0x05, 0x02, 0x26, 0x53,
0x36, 0x9b, 0xcf, 0x67, 0xb3, 0x00, 0xf5, 0xba,
0xa2, 0xd8, 0xed, 0x00, 0xc9, 0x64, 0xa5, 0xe2,
0x76, 0x03, 0x54, 0x2a, 0xcd, 0xa6, 0xd9, 0xbc,
0xf3, 0x8d, 0x71, 0xdc, 0x68, 0x6c, 0x0f, 0x48,
0xa3, 0x31, 0x3c, 0x3c, 0x3b, 0x0b, 0x70, 0xea,
0xd4, 0xe5, 0xcb, 0xb3, 0xb3, 0xbd, 0x25, 0x8d,
0x8d, 0xd9, 0x6c, 0x14, 0xf5, 0xfe, 0xfd, 0xe2,
0xe2, 0xc2, 0xc2, 0xcd, 0x9b, 0xc1, 0xa0, 0x4e,
0xc0, 0xe6, 0x26, 0xc3, 0x30, 0x4c, 0xb9, 0x8c,
0xd0, 0xd4, 0xd4, 0xe4, 0x64, 0x30, 0x08, 0xc0,
0xb2, 0x2c, 0xcb, 0xb2, 0x00, 0x6f, 0xdf, 0x6e,
0x6c, 0x00, 0x00, 0xdc, 0xbe, 0x7d, 0xe5, 0xca,
0xf9, 0xf3, 0x7f, 0x3e, 0x13, 0xfd, 0x62, 0x61,
0xe1, 0xe1, 0xc3, 0xa5, 0xa5, 0x89, 0x89, 0x1e,
0x19, 0x60, 0x18, 0x41, 0x10, 0x84, 0x66, 0x13,
0xa1, 0x4c, 0xe6, 0xc7, 0x8f, 0x4c, 0x06, 0x80,
0xa2, 0x68, 0x9a, 0xa2, 0x00, 0x38, 0x4e, 0x14,
0x03, 0x01, 0x80, 0x5a, 0xad, 0xd1, 0x40, 0x08,
0x80, 0x20, 0x48, 0x92, 0xe3, 0xfe, 0x9d, 0xe3,
0x3e, 0xdf, 0xc8, 0x08, 0x8e, 0x03, 0xf0, 0xbc,
0x20, 0x28, 0x8a, 0x28, 0xf6, 0x10, 0x40, 0x10,
0xc5, 0x62, 0xb1, 0x48, 0xd3, 0x08, 0x05, 0x02,
0x7e, 0x7f, 0x20, 0x00, 0x50, 0xad, 0xf2, 0x7c,
0xb5, 0x0a, 0x00, 0x50, 0x2e, 0xff, 0x1f, 0x11,
0xd7, 0xc0, 0xb2, 0x0c, 0x53, 0x2a, 0x29, 0x4a,
0xa3, 0x21, 0x8a, 0x46, 0x23, 0x49, 0x6a, 0xf6,
0xad, 0x77, 0xad, 0x7a, 0x7d, 0xe5, 0x72, 0x92,
0x24, 0x49, 0xb2, 0x2c, 0x8a, 0x24, 0x49, 0x92,
0x24, 0x09, 0x90, 0x4c, 0x6e, 0x6c, 0x50, 0x14,
0xc0, 0xf4, 0xf4, 0xe4, 0xe4, 0xf8, 0x38, 0xc0,
0x6e, 0x0e, 0xdc, 0x4e, 0xe0, 0x70, 0x58, 0x2c,
0x26, 0x13, 0x40, 0xb5, 0x5a, 0xaf, 0x0b, 0x82,
0x2c, 0xfb, 0xfd, 0xd5, 0xea, 0xab, 0x57, 0xb7,
0x6e, 0x69, 0xe3, 0x43, 0x7a, 0x82, 0x28, 0x22,
0x24, 0x8a, 0x08, 0x29, 0x8a, 0xea, 0x6c, 0xad,
0x26, 0xcb, 0x38, 0x0e, 0x10, 0x08, 0xb8, 0x5c,
0x76, 0x3b, 0x40, 0xb9, 0x5c, 0xad, 0x22, 0xa4,
0xde, 0x1e, 0x00, 0xea, 0x1c, 0xad, 0xa7, 0x5d,
0xa8, 0x7a, 0x91, 0xed, 0x76, 0xed, 0x3a, 0xee,
0xc6, 0xd3, 0x43, 0x51, 0x00, 0x2c, 0x16, 0xb3,
0xd9, 0x68, 0x04, 0x20, 0x88, 0x5c, 0xae, 0x58,
0x44, 0x48, 0x1d, 0x21, 0x88, 0x9e, 0x02, 0xac,
0x56, 0x9b, 0xcd, 0x62, 0x89, 0x46, 0x0b, 0x85,
0x42, 0x81, 0xa6, 0x0f, 0x1f, 0x1e, 0x1f, 0x1f,
0x1b, 0x3b, 0x7a, 0x14, 0xc0, 0x62, 0x19, 0x19,
0x71, 0xbb, 0x01, 0x48, 0x92, 0x61, 0xea, 0x75,
0x80, 0x46, 0x43, 0x14, 0x65, 0xb9, 0x73, 0x3b,
0xcd, 0x71, 0xcd, 0x39, 0x0c, 0x53, 0x3f, 0xed,
0xf6, 0x96, 0xad, 0x25, 0xab, 0x5b, 0x56, 0xf7,
0xef, 0xb7, 0xd9, 0x4c, 0x26, 0x00, 0x51, 0x94,
0x24, 0x45, 0x01, 0x48, 0x24, 0xd2, 0xe9, 0x6f,
0xdf, 0x7e, 0xfe, 0x7c, 0xf3, 0x46, 0xad, 0x94,
0x9e, 0x02, 0xd4, 0x0d, 0x3e, 0x7d, 0xe2, 0x79,
0x9e, 0xe7, 0xb8, 0xb9, 0x39, 0xaf, 0xf7, 0xc8,
0x11, 0x9f, 0x0f, 0xa0, 0x54, 0xe2, 0xb8, 0x66,
0x13, 0x20, 0x97, 0x63, 0x18, 0x41, 0xe8, 0x16,
0x2f, 0x0c, 0x6b, 0x8f, 0x68, 0x4b, 0x44, 0xa7,
0xbd, 0x7d, 0x5e, 0x27, 0xaf, 0x15, 0x08, 0x0c,
0x03, 0x68, 0x36, 0x55, 0xc7, 0x63, 0xb1, 0x58,
0x2c, 0x91, 0x40, 0xc8, 0xe5, 0xaa, 0xd5, 0x56,
0x57, 0xef, 0xdd, 0xd3, 0xef, 0xaa, 0x13, 0x60,
0x36, 0x93, 0x24, 0x49, 0x66, 0xb3, 0xc9, 0xa4,
0xdd, 0x3e, 0x3c, 0x6c, 0xb7, 0xcb, 0xf2, 0xd4,
0x94, 0xd7, 0xeb, 0x74, 0x1a, 0x0c, 0x04, 0x41,
0xd3, 0x08, 0x75, 0x8b, 0x7c, 0x67, 0xca, 0xf5,
0x7d, 0x7d, 0x79, 0xe8, 0xb3, 0xa2, 0xe7, 0xb9,
0x5c, 0x0e, 0x87, 0xd9, 0x0c, 0x80, 0x90, 0x24,
0xc9, 0x32, 0xc0, 0x97, 0x2f, 0xe9, 0x74, 0x22,
0x51, 0x28, 0xbc, 0x7c, 0x19, 0x89, 0x2c, 0x2f,
0x3f, 0x7a, 0xb4, 0x8d, 0x00, 0xa7, 0x33, 0x95,
0x4a, 0xa5, 0x52, 0x29, 0xab, 0xd5, 0xe3, 0xf1,
0x7a, 0x3d, 0x1e, 0x83, 0xe1, 0xc5, 0x8b, 0xb5,
0xb5, 0x5a, 0x0d, 0xfa, 0x80, 0x5a, 0x0a, 0x5a,
0x99, 0xb4, 0x97, 0x4c, 0x67, 0xf9, 0xfc, 0x37,
0xe2, 0xed, 0x3c, 0x51, 0x14, 0x45, 0x75, 0x9c,
0xe3, 0xf2, 0x79, 0x49, 0x02, 0xa8, 0xd5, 0x28,
0x6a, 0x69, 0x49, 0x9d, 0xab, 0xfd, 0xc0, 0x6f,
0x85, 0x50, 0x27, 0x80, 0xe3, 0x8a, 0xc5, 0x62,
0xb1, 0x58, 0x5c, 0x5f, 0xff, 0xfc, 0x39, 0x1e,
0x8f, 0xc7, 0xef, 0xde, 0xb5, 0x5a, 0x6d, 0xb6,
0x74, 0xfa, 0xce, 0x9d, 0x7e, 0x24, 0xfc, 0x49,
0x88, 0x62, 0xa9, 0xb4, 0xbe, 0xfe, 0xf5, 0x6b,
0x3c, 0xbe, 0xb2, 0xf2, 0xe0, 0xc1, 0xe3, 0xc7,
0xaa, 0xd5, 0x66, 0x53, 0x5b, 0x96, 0xdd, 0xca,
0x68, 0x77, 0x3a, 0x8e, 0xab, 0xad, 0xc5, 0xd2,
0x49, 0xd4, 0xda, 0xd6, 0x5f, 0x9d, 0xbf, 0x03,
0x2d, 0x47, 0xcd, 0xa6, 0xda, 0x6a, 0x35, 0xc0,
0x30, 0x6a, 0x5b, 0xaf, 0x6f, 0x23, 0xa0, 0x17,
0x34, 0xc7, 0xb1, 0x01, 0x79, 0xbb, 0x85, 0x56,
0x32, 0xff, 0xfa, 0x2d, 0xb4, 0x87, 0xed, 0xf1,
0x1b, 0xf2, 0x64, 0x75, 0xa3, 0x7d, 0x21, 0xad,
0x59, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};

272
art/tango/go_down.h Normal file
View File

@@ -0,0 +1,272 @@
/* go_down.png - 683 bytes */
static const unsigned char go_down_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
0x02, 0x3d, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
0x85, 0x93, 0x4d, 0x68, 0x13, 0x41, 0x18, 0x86,
0xdf, 0x99, 0xec, 0xe6, 0x0f, 0x6b, 0xc0, 0x60,
0xd2, 0x43, 0xfc, 0xc1, 0xaa, 0xf5, 0x22, 0x1a,
0x8f, 0x49, 0xb4, 0xe0, 0xc1, 0x8b, 0xf1, 0x22,
0x14, 0x2f, 0x1e, 0x2a, 0xe2, 0x41, 0x14, 0xea,
0xa1, 0x55, 0xf1, 0x2a, 0x08, 0xd2, 0x15, 0x3c,
0xa9, 0x50, 0x84, 0x9c, 0x14, 0x21, 0xa2, 0x52,
0x53, 0x5b, 0x72, 0xb1, 0xd6, 0x55, 0x08, 0xb5,
0x2d, 0x14, 0x7b, 0xa8, 0x55, 0xb4, 0x54, 0xcd,
0x9a, 0xae, 0xfd, 0x0b, 0xe9, 0x26, 0xb3, 0xb3,
0x9f, 0x87, 0xd6, 0x1a, 0x9b, 0x18, 0xdf, 0xe3,
0x37, 0xdf, 0x3c, 0xf3, 0xbe, 0xf3, 0xcd, 0x30,
0x22, 0x42, 0xb5, 0xe2, 0xdd, 0x6a, 0x1e, 0x84,
0x30, 0xea, 0x89, 0xc1, 0xd0, 0x7b, 0x44, 0x73,
0x75, 0x49, 0xa9, 0x69, 0x22, 0x84, 0x6f, 0x5d,
0x48, 0xc3, 0x76, 0x04, 0x6c, 0x47, 0x60, 0xc9,
0x2a, 0x60, 0xc9, 0x32, 0x01, 0x00, 0x77, 0x1f,
0xdd, 0xa8, 0x01, 0xd7, 0x02, 0x00, 0x30, 0xc6,
0x90, 0x9b, 0x79, 0x8e, 0xb2, 0x5d, 0x42, 0xa1,
0x38, 0x83, 0x8f, 0x73, 0x63, 0x68, 0x3f, 0x78,
0xb5, 0xae, 0x29, 0x5e, 0xaf, 0x58, 0x1d, 0xca,
0xa3, 0xf8, 0xeb, 0x6e, 0x6c, 0x08, 0x00, 0x11,
0x88, 0x1c, 0x10, 0x11, 0x14, 0xee, 0x6e, 0x08,
0x50, 0x12, 0x97, 0x55, 0x9d, 0x1c, 0xc4, 0xd6,
0xed, 0xbb, 0x60, 0x39, 0x24, 0xbd, 0x92, 0x6c,
0x48, 0xb2, 0xb1, 0x5c, 0x36, 0x51, 0xbd, 0x16,
0xef, 0x52, 0xd7, 0x0d, 0x32, 0x8e, 0x37, 0x0a,
0x39, 0x48, 0x45, 0x42, 0x2d, 0xd1, 0x8b, 0x27,
0xaf, 0xfb, 0x14, 0x97, 0x0a, 0x22, 0xc7, 0x2b,
0x49, 0x82, 0x98, 0x04, 0xb8, 0x44, 0x51, 0x16,
0xa0, 0x7a, 0x39, 0xb8, 0xc2, 0x70, 0xfe, 0xd4,
0x35, 0x2f, 0x08, 0x10, 0xa2, 0x82, 0x74, 0x36,
0x55, 0x9a, 0x5f, 0x9c, 0x4b, 0x31, 0x22, 0x42,
0xa2, 0x5b, 0x4d, 0xb7, 0x45, 0x8f, 0x27, 0x8f,
0x44, 0x93, 0x9e, 0xf7, 0xf9, 0x57, 0x90, 0x5c,
0x40, 0xa2, 0x8c, 0x15, 0x7b, 0x11, 0xd3, 0xf3,
0x39, 0x10, 0x68, 0x2d, 0x16, 0x47, 0xdb, 0xf6,
0xd3, 0x18, 0x9d, 0x18, 0x29, 0x4f, 0x4e, 0x8d,
0xf7, 0xbd, 0xee, 0x11, 0xed, 0x7c, 0x2d, 0x72,
0xc7, 0xcb, 0xb1, 0x8c, 0xf1, 0xc5, 0x98, 0xa2,
0x48, 0x70, 0x2f, 0x88, 0x57, 0x00, 0x97, 0x8d,
0x42, 0x65, 0x1a, 0xaa, 0x8f, 0xc1, 0xed, 0xe3,
0x50, 0x7d, 0x2e, 0x44, 0x23, 0x47, 0x61, 0x2e,
0x98, 0x34, 0xf9, 0x61, 0xdc, 0x20, 0xc2, 0x99,
0xf5, 0x4b, 0xd4, 0x35, 0x51, 0x04, 0x21, 0xf9,
0x70, 0xf0, 0x9e, 0xe5, 0xe5, 0x4d, 0x08, 0xf8,
0x83, 0x28, 0xd1, 0x4f, 0x94, 0x5d, 0x8b, 0x70,
0x7b, 0x39, 0xdc, 0x3e, 0x17, 0xb6, 0x6d, 0xd9,
0x83, 0x90, 0xaf, 0x05, 0xd9, 0xa1, 0x8c, 0x45,
0x0e, 0x92, 0xba, 0x26, 0x8a, 0x7f, 0x4d, 0x41,
0xd7, 0xc4, 0x44, 0x45, 0xac, 0x74, 0x3e, 0x18,
0xbc, 0x53, 0xda, 0x11, 0x38, 0x00, 0x9b, 0x95,
0xa0, 0x7a, 0x56, 0x4f, 0xde, 0xbc, 0x29, 0x80,
0xfd, 0xa1, 0x63, 0xe8, 0xcb, 0x3e, 0x2e, 0x09,
0x51, 0xe9, 0xd4, 0x35, 0x31, 0x51, 0x77, 0x8c,
0xba, 0x26, 0x7a, 0x67, 0x8d, 0x4f, 0x2f, 0x86,
0xc7, 0x06, 0x44, 0x6b, 0x30, 0x01, 0xae, 0x30,
0x28, 0x6e, 0x8e, 0x43, 0xe1, 0x13, 0xc8, 0xbd,
0x7b, 0x5b, 0xf9, 0x61, 0x7e, 0xeb, 0xd7, 0x35,
0xd1, 0xdb, 0xf0, 0x1d, 0x90, 0x83, 0x8e, 0xa1,
0x91, 0x81, 0xef, 0xa6, 0xb1, 0x40, 0xbb, 0x9b,
0x62, 0xd8, 0xe5, 0x8f, 0xc1, 0xfc, 0xba, 0x4c,
0xb9, 0x51, 0x3d, 0xef, 0xc8, 0xd5, 0xdc, 0x0d,
0x01, 0xba, 0x26, 0x8a, 0x24, 0x91, 0xcc, 0x64,
0x9f, 0x59, 0x5b, 0xb1, 0x0f, 0x41, 0xa7, 0x15,
0x4f, 0xfb, 0x9f, 0x58, 0x8e, 0xfc, 0x93, 0xbb,
0x5a, 0x6c, 0xe3, 0x6f, 0xfc, 0xad, 0x78, 0x97,
0x7a, 0x2e, 0xd2, 0xbc, 0xf3, 0x36, 0x00, 0xcc,
0xe6, 0x3f, 0x5f, 0xda, 0x68, 0xfd, 0xbf, 0x00,
0x00, 0x38, 0x7c, 0x45, 0xbd, 0x0f, 0x00, 0xc3,
0x37, 0xc5, 0xd9, 0x7f, 0xf5, 0xfc, 0x02, 0x73,
0x4a, 0x12, 0x2a, 0x86, 0x68, 0x1c, 0xcb, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};
/* go_down.png - 1433 bytes */
static const unsigned char go_down_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
0xf6, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x56, 0x4f, 0x48, 0x54, 0x5d, 0x14, 0xff, 0xbd,
0x7f, 0x33, 0xa3, 0x0b, 0x87, 0x52, 0x73, 0xd2,
0x6c, 0x08, 0x22, 0xed, 0x9f, 0x15, 0x95, 0xda,
0x88, 0x60, 0x11, 0xd8, 0x42, 0x22, 0xa2, 0x20,
0x6a, 0x2d, 0xb6, 0x69, 0x11, 0x21, 0x51, 0xdb,
0x8a, 0xa0, 0xc9, 0x5a, 0xe5, 0x2e, 0x28, 0x17,
0x62, 0x59, 0x60, 0xa4, 0x84, 0x0b, 0x8d, 0x90,
0x66, 0x42, 0x73, 0x51, 0x03, 0x86, 0xc3, 0x0c,
0x3a, 0x33, 0x3a, 0x3a, 0xe5, 0xe4, 0x38, 0x32,
0xe3, 0x9b, 0xb9, 0xf7, 0xbd, 0xfb, 0x2d, 0xde,
0xf7, 0x98, 0x7c, 0x36, 0x9f, 0x3a, 0xfa, 0xf1,
0x7d, 0x8b, 0x0e, 0x3c, 0x0e, 0xe7, 0x9e, 0x7b,
0xef, 0xf9, 0xfd, 0xce, 0xbd, 0xe7, 0xbe, 0x03,
0xfc, 0x91, 0x3f, 0xb2, 0x21, 0xe1, 0x72, 0x5d,
0xe8, 0x70, 0xb4, 0xb6, 0x8a, 0xe2, 0xec, 0x2c,
0xa0, 0xaa, 0x40, 0x49, 0x49, 0xee, 0x10, 0x78,
0x1e, 0x88, 0x44, 0x5c, 0x2e, 0xa7, 0x93, 0x52,
0x9b, 0x6d, 0xbd, 0xab, 0xc5, 0xdc, 0x03, 0x6b,
0xc0, 0xef, 0xdd, 0x6b, 0x69, 0x79, 0xfe, 0x1c,
0xa0, 0x54, 0x55, 0x09, 0x01, 0x14, 0x45, 0x55,
0x29, 0xd5, 0xec, 0x74, 0x3a, 0x63, 0x2b, 0x8a,
0xe6, 0xd7, 0xe7, 0xa5, 0xd3, 0x8a, 0x22, 0xcb,
0x40, 0x7b, 0x7b, 0x57, 0xd7, 0xdd, 0xbb, 0xb9,
0x27, 0x60, 0x03, 0x04, 0x32, 0xc2, 0x71, 0xc0,
0xd0, 0x90, 0xdf, 0xff, 0xf2, 0x25, 0x90, 0x4a,
0x51, 0x9a, 0x4c, 0x66, 0xb4, 0x0e, 0xd4, 0x38,
0x7e, 0xe6, 0xcc, 0xde, 0xbd, 0xcd, 0xcd, 0x1b,
0x8f, 0xcd, 0x6f, 0x06, 0x81, 0xb5, 0x92, 0xe4,
0x72, 0xbe, 0xb0, 0xff, 0x32, 0x01, 0xc6, 0x32,
0xdf, 0x4a, 0x1f, 0x63, 0xbf, 0xfa, 0x19, 0x63,
0x4c, 0x55, 0x33, 0xe3, 0xff, 0x39, 0x81, 0xdf,
0x01, 0xd3, 0xb4, 0x56, 0x25, 0x99, 0x39, 0x1a,
0x60, 0x42, 0x14, 0x25, 0x95, 0xda, 0x8c, 0xb4,
0x69, 0x92, 0xb5, 0x06, 0xea, 0xea, 0x5a, 0x5b,
0x45, 0xf1, 0xfd, 0x7b, 0x0d, 0x4e, 0x43, 0xc3,
0x0a, 0xe6, 0xbc, 0x28, 0x72, 0x9c, 0x2c, 0x6b,
0x80, 0x2d, 0x16, 0x1d, 0x78, 0xe6, 0xd3, 0x6d,
0x4d, 0xa7, 0xd3, 0x8a, 0xb2, 0xb4, 0x04, 0xc8,
0x32, 0xa5, 0x89, 0xc4, 0xca, 0x7d, 0x1c, 0x8e,
0x1b, 0x37, 0x44, 0xf1, 0x77, 0x67, 0xc2, 0xf3,
0xc0, 0x87, 0x0f, 0xda, 0x2b, 0xb5, 0x12, 0x47,
0x56, 0x02, 0xaa, 0xaa, 0x28, 0x8c, 0xb5, 0xb5,
0xd9, 0xed, 0x36, 0xdb, 0x9e, 0x3d, 0x35, 0x35,
0xcd, 0xcd, 0x67, 0xcf, 0xde, 0xbe, 0x9d, 0x97,
0x27, 0x8a, 0x82, 0x20, 0x49, 0x80, 0xa2, 0x30,
0x46, 0xa9, 0xc5, 0xa2, 0xbf, 0x32, 0xaa, 0xca,
0x18, 0xa5, 0x5a, 0x40, 0x55, 0xd5, 0x80, 0x69,
0xa7, 0xa0, 0xaa, 0xb2, 0x0c, 0xc8, 0x32, 0x30,
0x3f, 0x0f, 0x48, 0x92, 0xd9, 0xcc, 0xf3, 0x00,
0xcf, 0x0b, 0x02, 0x00, 0x5c, 0xbd, 0x7a, 0xf1,
0xe2, 0xad, 0x5b, 0x5a, 0x02, 0x00, 0x80, 0x10,
0x42, 0x52, 0x29, 0xe0, 0xcd, 0x9b, 0x81, 0x81,
0xce, 0xce, 0x64, 0x72, 0x6e, 0x6e, 0x7e, 0x3e,
0x1c, 0x7e, 0xf4, 0x28, 0x1b, 0x4e, 0x21, 0x9b,
0x63, 0x6a, 0xca, 0xed, 0x66, 0xcc, 0xeb, 0x2d,
0x28, 0xa8, 0xaa, 0x8a, 0xc5, 0x64, 0x39, 0x12,
0x89, 0xc5, 0xa6, 0xa6, 0xea, 0xeb, 0x77, 0xef,
0x2e, 0x2f, 0xdf, 0xbf, 0x5f, 0x92, 0x3e, 0x7f,
0x0e, 0x85, 0xde, 0xbd, 0x03, 0xfc, 0xfe, 0x68,
0x74, 0x64, 0x04, 0x50, 0x55, 0x9e, 0xd7, 0x9e,
0x4f, 0x60, 0x69, 0x09, 0x88, 0xc5, 0x08, 0x09,
0x87, 0x81, 0x64, 0x52, 0x55, 0xa3, 0x51, 0x80,
0xe7, 0x25, 0x89, 0xe3, 0x00, 0x41, 0x10, 0x45,
0x8e, 0x03, 0xc6, 0xc7, 0xa3, 0x51, 0x97, 0x0b,
0x08, 0x06, 0x63, 0x31, 0x8f, 0x07, 0x28, 0x2b,
0xb3, 0x5a, 0x2b, 0x2b, 0x81, 0xc1, 0x41, 0xb7,
0xbb, 0xb7, 0x37, 0x99, 0x9c, 0x9a, 0x8a, 0x46,
0x83, 0xc1, 0x3b, 0x77, 0x5c, 0xae, 0xb6, 0x36,
0x45, 0x79, 0xfa, 0x74, 0xdd, 0x04, 0x74, 0x09,
0x85, 0xdc, 0x6e, 0x55, 0x75, 0xbb, 0xf3, 0xf3,
0x0f, 0x1c, 0x98, 0x9d, 0xdd, 0xb5, 0x8b, 0x10,
0x42, 0x08, 0xd9, 0xb7, 0xef, 0xd8, 0xb1, 0x8a,
0x8a, 0x93, 0x27, 0x45, 0x31, 0x12, 0x49, 0x24,
0x7c, 0x3e, 0x40, 0x96, 0x19, 0x5b, 0x58, 0x00,
0xbe, 0x7f, 0x97, 0x65, 0x9f, 0x4f, 0x23, 0x94,
0x4a, 0x01, 0x82, 0xa0, 0x01, 0x17, 0x45, 0x4d,
0x6b, 0x57, 0x06, 0x30, 0x99, 0x24, 0xc9, 0x6c,
0x06, 0xea, 0xeb, 0xed, 0xf6, 0x4b, 0x97, 0x80,
0xd1, 0x51, 0x8f, 0x67, 0x78, 0x58, 0x96, 0xbd,
0xde, 0x40, 0xc0, 0xe3, 0xe9, 0xe9, 0x71, 0xb9,
0x9c, 0x4e, 0x45, 0xb9, 0x7e, 0x7d, 0x35, 0x7c,
0xab, 0x12, 0xd0, 0xa5, 0xa6, 0xa6, 0xb4, 0x94,
0xb1, 0xbe, 0xbe, 0xb1, 0x31, 0x4a, 0x27, 0x27,
0x4f, 0x9f, 0x2e, 0x28, 0xc8, 0xcf, 0xb7, 0x5a,
0x4b, 0x4b, 0x2b, 0x2b, 0xed, 0xf6, 0x23, 0x47,
0x04, 0xe1, 0xeb, 0xd7, 0xb9, 0xb9, 0xfe, 0x7e,
0x00, 0x10, 0x45, 0x4a, 0x01, 0x51, 0x34, 0x99,
0x78, 0x3e, 0x43, 0x40, 0x10, 0x24, 0x49, 0xb3,
0x45, 0x91, 0xe7, 0x81, 0xda, 0xda, 0xb2, 0xb2,
0x0b, 0x17, 0x80, 0x40, 0x20, 0x10, 0x08, 0x06,
0x29, 0x1d, 0x1e, 0xfe, 0xf2, 0x65, 0x68, 0xc8,
0xe3, 0x59, 0x5a, 0x8a, 0xc5, 0x14, 0xa5, 0xa9,
0x69, 0x66, 0x66, 0x74, 0x34, 0xf3, 0x0c, 0x6c,
0x02, 0x81, 0xb1, 0xb1, 0xb1, 0x31, 0x80, 0xb1,
0x9d, 0x3b, 0xeb, 0xea, 0x54, 0xf5, 0xf5, 0x6b,
0xbf, 0x7f, 0x7a, 0x7a, 0x7c, 0xfc, 0xf2, 0x65,
0x9b, 0xad, 0xb8, 0xb8, 0xac, 0xcc, 0x6a, 0xdd,
0xbe, 0xbd, 0xa8, 0xa8, 0xbc, 0x9c, 0xe3, 0xe6,
0xe6, 0x08, 0xf1, 0xfb, 0xb5, 0x8c, 0xf3, 0xfc,
0x4a, 0x22, 0x87, 0x0e, 0x6d, 0xdb, 0xd6, 0xd8,
0x08, 0x24, 0x12, 0xb1, 0x18, 0xa5, 0x8c, 0xf5,
0xf7, 0x0f, 0x0e, 0xbe, 0x7d, 0x1b, 0x89, 0x28,
0x0a, 0x21, 0x94, 0x3a, 0x1c, 0xc3, 0xc3, 0x4f,
0x9e, 0x00, 0xbf, 0x96, 0xf9, 0x3f, 0xcb, 0xba,
0x9f, 0xd1, 0x8f, 0x1f, 0x1f, 0x3c, 0x00, 0x16,
0x17, 0x79, 0x9e, 0x10, 0x42, 0x1a, 0x1a, 0xfa,
0xfa, 0x06, 0x06, 0xba, 0xbb, 0x17, 0x16, 0xcc,
0x66, 0x45, 0xd9, 0xb2, 0x05, 0xa8, 0xa8, 0x28,
0x2c, 0x74, 0x38, 0x34, 0xe0, 0x1c, 0x97, 0x29,
0xda, 0x8a, 0x8a, 0xa2, 0xa2, 0x13, 0x27, 0x80,
0xbc, 0x3c, 0x45, 0xd9, 0xba, 0x15, 0xe8, 0xed,
0xed, 0xef, 0xef, 0xe9, 0x59, 0x5c, 0x64, 0x0c,
0x10, 0x84, 0x53, 0xa7, 0xdc, 0xee, 0xc7, 0x8f,
0x81, 0x9f, 0x3f, 0xd7, 0x8b, 0x67, 0xcd, 0x27,
0x60, 0x94, 0x40, 0xc0, 0xed, 0x06, 0xe2, 0xf1,
0x1d, 0x3b, 0xaa, 0xab, 0x39, 0x6e, 0x60, 0xc0,
0xe7, 0x9b, 0x9c, 0xf4, 0x7a, 0xaf, 0x5c, 0xa9,
0xab, 0xab, 0xaa, 0x6a, 0x6c, 0x34, 0x99, 0x54,
0x55, 0x14, 0x65, 0x19, 0xb0, 0x5a, 0x2d, 0x96,
0xe2, 0x62, 0xc0, 0x6e, 0xcf, 0xcb, 0x3b, 0x7a,
0x14, 0xe8, 0xe8, 0xe8, 0xea, 0x7a, 0xf6, 0x2c,
0x91, 0x48, 0x26, 0x65, 0x59, 0x96, 0xcf, 0x9f,
0x77, 0xbb, 0x9d, 0x4e, 0x42, 0x46, 0x46, 0x72,
0xc5, 0x91, 0x33, 0x01, 0x5d, 0x42, 0xa1, 0x4f,
0x9f, 0x54, 0x35, 0x1c, 0xb6, 0xd9, 0x6a, 0x6b,
0x29, 0x1d, 0x1f, 0x9f, 0x98, 0x98, 0x98, 0xf0,
0xf9, 0x9a, 0x9a, 0x1a, 0x1a, 0x0e, 0x1f, 0x3e,
0x77, 0x4e, 0x92, 0x8a, 0x8a, 0x2c, 0x16, 0xbb,
0x1d, 0xe8, 0xec, 0x7c, 0xf5, 0xaa, 0xa3, 0x23,
0x91, 0x88, 0xc7, 0xe3, 0xf1, 0x78, 0xfc, 0xe6,
0x4d, 0x97, 0xeb, 0xe1, 0x43, 0x4a, 0x5f, 0xbc,
0xd8, 0x68, 0xfc, 0x35, 0x12, 0xd0, 0xbb, 0x18,
0xf1, 0xef, 0xff, 0x86, 0x24, 0x69, 0xda, 0x6c,
0xd6, 0x75, 0x28, 0xe4, 0x72, 0x31, 0x36, 0x31,
0x51, 0x58, 0x78, 0xf0, 0xa0, 0x2c, 0x03, 0x33,
0x33, 0x3f, 0x7e, 0x84, 0xc3, 0xc7, 0x8f, 0x7b,
0xbd, 0x93, 0x93, 0xdf, 0xbe, 0x51, 0x3a, 0x3d,
0x1d, 0x0c, 0x4e, 0x4f, 0x77, 0x77, 0xbb, 0x5c,
0x6d, 0x6d, 0x94, 0x3a, 0x9d, 0xda, 0x3a, 0x93,
0x69, 0xf9, 0x7e, 0xfa, 0xfe, 0x3c, 0xbf, 0x3c,
0x6e, 0xf6, 0x62, 0xce, 0xd2, 0x5e, 0xe9, 0x0b,
0x8d, 0x1b, 0x1b, 0x09, 0xe8, 0xb6, 0x20, 0x18,
0x01, 0x54, 0x57, 0x5f, 0xbb, 0x26, 0x08, 0xf7,
0xef, 0x0b, 0x82, 0x20, 0xf0, 0x7c, 0x49, 0xc9,
0xe8, 0x68, 0x7b, 0x3b, 0x21, 0x2d, 0x2d, 0xe9,
0x74, 0x3a, 0x0d, 0x10, 0xb2, 0x1c, 0x98, 0xf6,
0x0b, 0x04, 0x14, 0x65, 0xb9, 0xad, 0xcf, 0xd3,
0x6d, 0xe3, 0x38, 0x63, 0x59, 0x08, 0x18, 0x01,
0xea, 0xf6, 0x6a, 0xe3, 0xab, 0xf9, 0xf5, 0xc0,
0x46, 0x60, 0xc6, 0xf1, 0xd5, 0xfc, 0xe9, 0xb4,
0x4e, 0x38, 0x4b, 0x2b, 0xa1, 0x2f, 0x34, 0x9e,
0x48, 0x36, 0xd1, 0x33, 0xa9, 0x67, 0x50, 0xbf,
0x02, 0xc6, 0xab, 0xa0, 0xf7, 0x3a, 0xfa, 0xfc,
0xb5, 0x9e, 0x80, 0x0e, 0x58, 0xd7, 0x99, 0x2b,
0xb5, 0xce, 0x0e, 0x5d, 0x07, 0xa2, 0x5f, 0x19,
0xa3, 0x36, 0x02, 0x17, 0x0c, 0x35, 0xf6, 0x6b,
0x7f, 0xfa, 0x3b, 0xe2, 0x46, 0x22, 0xfa, 0xbc,
0xcd, 0x68, 0xbc, 0xff, 0xa7, 0xf2, 0x17, 0xde,
0xda, 0xf8, 0x24, 0x62, 0xe8, 0x0f, 0xfe, 0x00,
0x00, 0x00, 0x22, 0x7a, 0x54, 0x58, 0x74, 0x53,
0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00,
0x00, 0x78, 0xda, 0x2b, 0x2f, 0x2f, 0xd7, 0xcb,
0xcc, 0xcb, 0x2e, 0x4e, 0x4e, 0x2c, 0x48, 0xd5,
0xcb, 0x2f, 0x4a, 0x07, 0x00, 0x36, 0xd8, 0x06,
0x58, 0x10, 0x53, 0xca, 0x5c, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82};

278
art/tango/go_first.h Normal file
View File

@@ -0,0 +1,278 @@
/* go_first.png - 666 bytes */
static const unsigned char go_first_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
0x02, 0x2c, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
0x7d, 0x53, 0x4d, 0x48, 0x54, 0x51, 0x18, 0x3d,
0xdf, 0xbd, 0xef, 0x8d, 0x33, 0x19, 0x46, 0x09,
0x31, 0x41, 0x4d, 0x45, 0x41, 0xc2, 0x50, 0x54,
0x8b, 0xa6, 0xe6, 0x41, 0x20, 0x65, 0xa5, 0x26,
0x24, 0xb8, 0x48, 0x5c, 0x84, 0xa0, 0x41, 0x20,
0x6d, 0x66, 0x84, 0xb6, 0x41, 0xb4, 0x9a, 0x60,
0xd6, 0x19, 0x34, 0xb4, 0x28, 0xa8, 0x45, 0x20,
0xd3, 0xa6, 0x82, 0xa0, 0x18, 0xc8, 0x12, 0xc1,
0x4c, 0x88, 0x08, 0x8a, 0x99, 0x10, 0xed, 0xc7,
0xd1, 0x9c, 0x9f, 0x37, 0xef, 0xfe, 0xb5, 0x08,
0xc9, 0x91, 0x37, 0x73, 0xe1, 0x6e, 0xee, 0x77,
0xce, 0xe1, 0x1c, 0xbe, 0x73, 0x11, 0x4f, 0x58,
0x26, 0x9e, 0xb0, 0x8c, 0x31, 0x06, 0x8d, 0x6e,
0x3c, 0x61, 0x8d, 0x38, 0xe3, 0x56, 0xce, 0x6f,
0x66, 0xa1, 0xc9, 0x71, 0x92, 0xf6, 0x56, 0x22,
0x64, 0x22, 0xe1, 0x83, 0x3d, 0xf9, 0xc5, 0x2f,
0x21, 0x3f, 0x0c, 0x6b, 0x42, 0x3e, 0x0c, 0xc2,
0xfc, 0xb9, 0x13, 0x03, 0x7d, 0x63, 0xfd, 0xb7,
0x7c, 0xc9, 0x00, 0xfc, 0x1d, 0x38, 0x49, 0x7b,
0xb4, 0x35, 0xd4, 0x96, 0x1e, 0xee, 0x1d, 0x0f,
0x85, 0xdb, 0x23, 0xc4, 0x18, 0x6f, 0xe8, 0xb2,
0x4e, 0x60, 0xdd, 0x72, 0x47, 0xe4, 0x58, 0xcf,
0x60, 0xd7, 0x58, 0xa8, 0x2c, 0x8b, 0x98, 0x5b,
0x78, 0x85, 0xe3, 0x7b, 0xce, 0x83, 0x38, 0x5c,
0x27, 0x69, 0x9b, 0x3a, 0x36, 0x61, 0x89, 0xe2,
0x09, 0x6b, 0xfd, 0xf1, 0x08, 0x31, 0x96, 0xed,
0x3d, 0x35, 0xb8, 0x2b, 0x16, 0x3d, 0x6b, 0x7f,
0x5b, 0xfe, 0x80, 0x62, 0x65, 0x11, 0x86, 0x34,
0x62, 0x7b, 0xfb, 0xa0, 0xa1, 0xa0, 0xb5, 0x82,
0xd2, 0x12, 0x4a, 0x4b, 0x48, 0x25, 0x71, 0xfb,
0xfe, 0xf5, 0xff, 0x0e, 0xda, 0x5a, 0xdb, 0xa7,
0x2e, 0x77, 0x5d, 0x0b, 0x6e, 0xdf, 0xb6, 0x83,
0x66, 0x0a, 0xcf, 0x21, 0xb4, 0x0b, 0xe2, 0x06,
0x20, 0x8d, 0x5c, 0xe1, 0x11, 0x34, 0x14, 0xa4,
0xf6, 0x20, 0x64, 0x0d, 0x9e, 0xf0, 0x70, 0x7a,
0xdf, 0x50, 0x7d, 0x84, 0xab, 0x97, 0x6e, 0x84,
0x96, 0xdd, 0xef, 0x98, 0xce, 0xbf, 0x05, 0x88,
0xc0, 0x19, 0x03, 0x67, 0x80, 0x86, 0x80, 0x2b,
0x57, 0xe1, 0xea, 0x35, 0xb8, 0xa2, 0x04, 0xa9,
0x15, 0xa0, 0x18, 0x24, 0xbc, 0x7a, 0x81, 0xb5,
0x5a, 0x11, 0x2b, 0xd5, 0x1f, 0xf8, 0x59, 0x2e,
0xc0, 0x93, 0x2e, 0x14, 0xaf, 0x42, 0xf3, 0x2a,
0x8c, 0x2d, 0x60, 0xd9, 0x04, 0xc6, 0x09, 0x86,
0x03, 0x1a, 0x06, 0x4a, 0x1a, 0xb8, 0xea, 0x0f,
0x80, 0x0d, 0x6b, 0xcc, 0x4c, 0xa6, 0xab, 0xb5,
0xb2, 0x32, 0x87, 0x76, 0xc6, 0x50, 0x55, 0x2b,
0xa8, 0xa8, 0x22, 0x14, 0xf3, 0xc0, 0x6d, 0x82,
0x15, 0x60, 0xb0, 0x5a, 0x18, 0xec, 0x16, 0x06,
0x2b, 0xc0, 0xc0, 0x6d, 0x02, 0xb1, 0x4d, 0x5b,
0xa8, 0x79, 0x95, 0xd8, 0xb3, 0xd7, 0x8f, 0xb3,
0x47, 0x3b, 0x62, 0xe1, 0x33, 0xd1, 0x2b, 0x81,
0x8f, 0xbf, 0x5f, 0xe0, 0x97, 0xfc, 0x0a, 0x6e,
0x11, 0x2e, 0x1e, 0x48, 0x82, 0x71, 0x02, 0x00,
0x68, 0xf5, 0xcf, 0x81, 0x92, 0xa6, 0x5e, 0x20,
0x97, 0x12, 0x73, 0x4e, 0xd2, 0x8e, 0xce, 0x7e,
0x9a, 0xca, 0x2c, 0x2c, 0xe5, 0xbb, 0xbb, 0x3b,
0xfb, 0xb7, 0xac, 0xd2, 0x7e, 0x7c, 0x2e, 0xbd,
0x01, 0x31, 0xc2, 0x9d, 0xbb, 0x37, 0x5d, 0xe1,
0x9a, 0xe0, 0xe6, 0x35, 0xd6, 0xf5, 0x20, 0x97,
0x12, 0x25, 0x00, 0x03, 0x4e, 0xd2, 0x1e, 0x7d,
0x38, 0x79, 0x2f, 0x7d, 0xa1, 0xb3, 0x37, 0xe4,
0xec, 0x1e, 0x22, 0x00, 0x10, 0xae, 0x09, 0xe6,
0x52, 0x82, 0x36, 0x17, 0xc9, 0xb7, 0xca, 0xb9,
0x94, 0x98, 0x10, 0xc2, 0x3b, 0x99, 0x7d, 0xf9,
0xb4, 0xf0, 0x7e, 0xfa, 0x5d, 0x4d, 0x08, 0xcf,
0x0f, 0xd6, 0x58, 0x60, 0x3d, 0x92, 0xd1, 0x88,
0xce, 0xce, 0xcf, 0x64, 0x1f, 0x3c, 0x99, 0xa8,
0x34, 0xc2, 0x35, 0xfd, 0x8d, 0x1b, 0x22, 0x8d,
0x30, 0x8e, 0x61, 0x3f, 0xcc, 0x5f, 0x5a, 0xcc,
0x0f, 0xfb, 0xcc, 0x70, 0xa3, 0x34, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};
/* go_first.png - 1501 bytes */
static const unsigned char go_first_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
0x3a, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x96, 0x5f, 0x48, 0x54, 0x4f, 0x14, 0xc7, 0xcf,
0xcc, 0xdc, 0xbd, 0xbb, 0x6e, 0xca, 0xaf, 0x16,
0xc5, 0x4d, 0x2a, 0x23, 0x35, 0x24, 0x89, 0x84,
0x24, 0x58, 0xb5, 0x55, 0x50, 0xb4, 0x3f, 0x1a,
0x54, 0xba, 0x52, 0x41, 0xff, 0x2c, 0x22, 0xa3,
0x7c, 0xc8, 0x20, 0xab, 0x87, 0x08, 0x4a, 0x29,
0x83, 0xe8, 0xc5, 0x0a, 0x31, 0x02, 0x5f, 0xb2,
0xa2, 0x17, 0xb3, 0x40, 0x2c, 0x7c, 0x48, 0x2a,
0x4d, 0x13, 0xc2, 0x50, 0xca, 0xa8, 0x2d, 0xd4,
0x34, 0x95, 0x4d, 0xf7, 0xcf, 0xbd, 0x77, 0xee,
0xfc, 0x1e, 0xe6, 0x37, 0x5c, 0x77, 0x7f, 0x9a,
0x3f, 0x75, 0xdf, 0x7e, 0x1d, 0xb8, 0x9c, 0x3b,
0xf7, 0xce, 0x9d, 0xf9, 0x7c, 0xcf, 0x9c, 0x33,
0x73, 0x01, 0xfe, 0xd8, 0x1f, 0x5b, 0x94, 0x21,
0x71, 0x93, 0x9e, 0x5e, 0x51, 0x21, 0x49, 0x43,
0x43, 0x00, 0x8c, 0x01, 0xc4, 0xc6, 0xce, 0xd0,
0x15, 0x01, 0x7c, 0xfd, 0xda, 0xde, 0x5e, 0x53,
0xa3, 0x69, 0xf1, 0xf1, 0xf3, 0x9d, 0x28, 0x3d,
0xfd, 0xf4, 0x69, 0x49, 0xda, 0xbd, 0x1b, 0x21,
0x8c, 0x01, 0x4e, 0x9e, 0x7c, 0xf9, 0xf2, 0xda,
0x35, 0x4d, 0xcb, 0xce, 0x5e, 0xac, 0x00, 0xc9,
0xb8, 0xe5, 0xe0, 0xc7, 0x8f, 0x97, 0x94, 0x9c,
0x3b, 0x37, 0xfd, 0x29, 0x63, 0x8c, 0x01, 0xdc,
0xba, 0xd5, 0xd8, 0x58, 0x55, 0x15, 0x17, 0x37,
0x3f, 0x60, 0x84, 0xb8, 0xf0, 0xaa, 0xaa, 0x15,
0x2b, 0x62, 0x62, 0x12, 0x12, 0x4e, 0x9d, 0xfa,
0xf6, 0xed, 0xc7, 0x8f, 0x4f, 0x9f, 0x22, 0x22,
0xc2, 0xb5, 0x02, 0x78, 0xb6, 0x17, 0x0f, 0x1e,
0xbc, 0x7b, 0x57, 0x5d, 0x3d, 0xff, 0x01, 0x39,
0x78, 0x54, 0x14, 0x8f, 0x74, 0x4b, 0xcb, 0x86,
0x0d, 0x49, 0x49, 0x0e, 0x47, 0x79, 0xf9, 0xd1,
0xa3, 0x3b, 0x76, 0x54, 0x56, 0x86, 0x0f, 0x5c,
0x98, 0xb4, 0xf8, 0x21, 0xa6, 0x83, 0x27, 0x26,
0x72, 0xf0, 0xd6, 0xd6, 0xdc, 0xdc, 0x4d, 0x9b,
0x76, 0xed, 0x5a, 0xbe, 0x3c, 0x2d, 0x2d, 0x39,
0x39, 0x2b, 0xcb, 0x64, 0x92, 0x24, 0x42, 0x4c,
0xa6, 0x70, 0xe3, 0x87, 0x41, 0x00, 0x07, 0xcf,
0xcf, 0x97, 0x24, 0x49, 0x32, 0x9b, 0x1b, 0x1b,
0x8b, 0x8a, 0x72, 0x72, 0x0e, 0x1d, 0x8a, 0x8a,
0x8a, 0x89, 0xb1, 0xd9, 0xec, 0x76, 0x84, 0x3a,
0x3b, 0xdd, 0xee, 0xa7, 0x4f, 0x01, 0x36, 0x6f,
0x4e, 0x48, 0x70, 0xb9, 0x00, 0x10, 0x22, 0x04,
0xc0, 0xef, 0xe7, 0xdf, 0x31, 0x36, 0xf7, 0x0c,
0x08, 0x01, 0x0c, 0x0f, 0xf3, 0xda, 0xb3, 0xdb,
0xc3, 0x26, 0x80, 0x17, 0x7d, 0x65, 0xe5, 0xd2,
0xa5, 0x91, 0x91, 0xd1, 0xd1, 0x17, 0x2e, 0x14,
0x17, 0xe7, 0xe6, 0x96, 0x96, 0x5a, 0xad, 0x5e,
0x2f, 0x63, 0xe3, 0xe3, 0x00, 0x9d, 0x9d, 0x6e,
0x77, 0x73, 0x33, 0x80, 0x24, 0x61, 0x2c, 0xcb,
0x00, 0xba, 0xae, 0xeb, 0x9a, 0x06, 0x70, 0xf1,
0xe2, 0xe1, 0xc3, 0x75, 0x75, 0x16, 0x0b, 0xc6,
0x7c, 0xad, 0x10, 0x12, 0x9e, 0x5f, 0x02, 0x59,
0xd8, 0xf9, 0xf3, 0xb7, 0x6f, 0xef, 0xdf, 0x3f,
0xd3, 0xa6, 0xb2, 0x20, 0x01, 0x08, 0x65, 0x64,
0x9c, 0x39, 0x23, 0x49, 0x8f, 0x1f, 0xaf, 0x5a,
0x65, 0xb7, 0x27, 0x25, 0xe5, 0xe5, 0x6d, 0xdf,
0x9e, 0x99, 0xe9, 0x72, 0x59, 0xad, 0x03, 0x03,
0xe3, 0xe3, 0x3d, 0x3d, 0x00, 0xc3, 0xc3, 0x1e,
0xcf, 0xe7, 0xcf, 0x00, 0x84, 0x60, 0x2c, 0x49,
0xc6, 0x26, 0xd0, 0xd2, 0xd2, 0xd7, 0x77, 0xf7,
0xae, 0xf1, 0x9c, 0x10, 0x84, 0x24, 0x69, 0xba,
0x80, 0x60, 0x21, 0x4e, 0x67, 0x42, 0x42, 0x49,
0xc9, 0xdc, 0x44, 0xff, 0x41, 0xc0, 0xf4, 0x78,
0x00, 0xa4, 0xa6, 0x26, 0x27, 0x3b, 0x1c, 0x5b,
0xb7, 0xa6, 0xa5, 0xa5, 0xa4, 0x64, 0x66, 0x9a,
0xcd, 0x1d, 0x1d, 0x6e, 0xf7, 0x93, 0x27, 0x00,
0xbf, 0x7e, 0x05, 0x02, 0xe3, 0xe3, 0x3c, 0xe2,
0x26, 0x13, 0x80, 0xae, 0x33, 0xa6, 0xeb, 0x5c,
0x80, 0xae, 0x03, 0xe8, 0x3a, 0x00, 0x17, 0xc4,
0xdf, 0x33, 0x86, 0x90, 0xa6, 0xf1, 0xd1, 0x39,
0x38, 0x63, 0x18, 0x1b, 0x82, 0x35, 0x4d, 0xd7,
0x55, 0x35, 0x0c, 0x02, 0x44, 0x44, 0xb6, 0x6c,
0xc9, 0xc9, 0x29, 0x28, 0x20, 0x64, 0xd9, 0xb2,
0x25, 0x4b, 0xec, 0x76, 0x42, 0x5e, 0xbc, 0xe8,
0xef, 0x6f, 0x68, 0x00, 0xd0, 0x34, 0xc6, 0x14,
0x85, 0x47, 0x96, 0x83, 0x71, 0x58, 0x71, 0x01,
0x48, 0x12, 0xa5, 0x00, 0xaa, 0x8a, 0xd0, 0xd4,
0x14, 0x00, 0xa5, 0x94, 0x2a, 0x0a, 0x80, 0xa6,
0x69, 0x9a, 0xdf, 0xcf, 0x41, 0x15, 0xc5, 0x10,
0x20, 0x49, 0x08, 0x59, 0x2c, 0x00, 0xaa, 0xca,
0x98, 0xd7, 0x1b, 0x96, 0x15, 0x08, 0x36, 0x5d,
0x67, 0x4c, 0xd3, 0x00, 0x54, 0x55, 0xd7, 0x03,
0x01, 0x00, 0x55, 0xa5, 0xd4, 0xef, 0xe7, 0x29,
0x10, 0x08, 0x18, 0x11, 0xc7, 0x58, 0x96, 0x45,
0x89, 0x6a, 0x1a, 0x80, 0x24, 0x99, 0x4c, 0x18,
0x03, 0x60, 0xcc, 0x4f, 0x07, 0x8c, 0x09, 0xe1,
0xc1, 0xe1, 0x2b, 0xcc, 0x98, 0xae, 0x33, 0x06,
0x10, 0x08, 0x50, 0xea, 0xf3, 0x01, 0x4c, 0x4d,
0x51, 0x3a, 0x36, 0x36, 0x37, 0x0f, 0x9e, 0xab,
0x03, 0x63, 0xfc, 0x7a, 0xf6, 0xac, 0xb5, 0xb5,
0xa9, 0x49, 0xd7, 0xfb, 0xfa, 0x3e, 0x7e, 0xec,
0xed, 0x0d, 0x04, 0xb2, 0xb3, 0x13, 0x13, 0xf7,
0xec, 0x01, 0x88, 0x8c, 0x34, 0x9b, 0x6d, 0x36,
0x80, 0x40, 0x40, 0xd3, 0xbc, 0x5e, 0x00, 0x4a,
0x31, 0x0e, 0x04, 0x00, 0x00, 0x08, 0xe1, 0xe0,
0xb2, 0x8c, 0x31, 0x80, 0xc9, 0x64, 0x36, 0x63,
0x0c, 0x20, 0xcb, 0x16, 0x0b, 0xf7, 0x56, 0x2b,
0xc6, 0x00, 0x66, 0x73, 0x44, 0x04, 0x6f, 0x47,
0x44, 0x10, 0x02, 0x60, 0x32, 0x59, 0x2c, 0x84,
0x18, 0x42, 0x17, 0x2d, 0x80, 0xe3, 0x1b, 0xf7,
0x5d, 0x5d, 0xef, 0xdf, 0xbf, 0x7e, 0xfd, 0xfc,
0x79, 0x6b, 0x6b, 0x7b, 0x7b, 0x73, 0xb3, 0xcf,
0xe7, 0x70, 0xc4, 0xc7, 0xef, 0xdc, 0x09, 0xb0,
0x7a, 0xb5, 0xcd, 0xb6, 0x7e, 0xbd, 0x11, 0x59,
0x01, 0x40, 0x88, 0xc9, 0xc4, 0xbd, 0x2c, 0x23,
0xc4, 0x01, 0xa7, 0x03, 0xcb, 0xb2, 0xd5, 0x2a,
0xc0, 0x79, 0x0a, 0xf1, 0x7e, 0x18, 0xe3, 0x19,
0xd8, 0x08, 0x59, 0x74, 0x0a, 0xbd, 0x7a, 0x75,
0xe3, 0x06, 0xa5, 0xc7, 0x8e, 0x29, 0xca, 0x91,
0x23, 0x03, 0x03, 0xe5, 0xe5, 0x1e, 0xcf, 0xe4,
0x64, 0x43, 0xc3, 0x89, 0x13, 0xdb, 0xb6, 0x65,
0x65, 0x15, 0x15, 0x59, 0x2c, 0xd1, 0xd1, 0x7f,
0xfd, 0x15, 0x1b, 0x0b, 0xf0, 0xe1, 0xc3, 0xc4,
0x44, 0x5b, 0x1b, 0x00, 0xc6, 0x3c, 0x49, 0x0a,
0x0a, 0xd6, 0xac, 0xa9, 0xa8, 0x00, 0x20, 0x44,
0xa4, 0x90, 0x48, 0x29, 0x0e, 0x4a, 0xa9, 0xa6,
0x31, 0x06, 0x40, 0xa9, 0xaa, 0xf2, 0x3a, 0xe2,
0xed, 0x60, 0x93, 0x65, 0xee, 0xfd, 0x7e, 0x11,
0xd0, 0x05, 0x9e, 0x03, 0xb2, 0xdc, 0xd5, 0x55,
0x57, 0x47, 0x69, 0x7d, 0xfd, 0xda, 0xb5, 0x05,
0x05, 0x3f, 0x7f, 0x0e, 0x0c, 0x3c, 0x7c, 0xe8,
0xf7, 0xdf, 0xbb, 0x77, 0xf5, 0x6a, 0x7e, 0xbe,
0xd3, 0x59, 0x58, 0x68, 0xb5, 0x66, 0x64, 0xac,
0x5c, 0xe9, 0x72, 0x21, 0xd4, 0xdd, 0x3d, 0x3a,
0xda, 0xd4, 0x64, 0x7c, 0x59, 0x53, 0x73, 0xe7,
0xce, 0xa5, 0x4b, 0x8a, 0x42, 0xa9, 0xa2, 0x30,
0x26, 0x80, 0x7e, 0x67, 0x08, 0x01, 0x8c, 0x8c,
0xfc, 0x13, 0x6f, 0x29, 0xd8, 0xab, 0xea, 0x02,
0x05, 0x88, 0xe5, 0x25, 0xa4, 0xbf, 0xbf, 0xa9,
0x49, 0xd7, 0xdf, 0xbc, 0xf1, 0x78, 0xdc, 0x6e,
0x9f, 0xaf, 0xb4, 0x54, 0x55, 0x55, 0xf5, 0xd1,
0xa3, 0x9b, 0x37, 0x1d, 0x8e, 0x8d, 0x1b, 0x9d,
0x4e, 0x9b, 0x2d, 0x23, 0x23, 0x25, 0x65, 0xef,
0x5e, 0x49, 0xd2, 0x75, 0x4a, 0x79, 0x84, 0x39,
0x78, 0x7b, 0xfb, 0xf5, 0xeb, 0x9a, 0x96, 0x99,
0xc9, 0xc7, 0xe1, 0x55, 0x63, 0x78, 0x11, 0xe1,
0xd0, 0xb6, 0x98, 0xd7, 0xa8, 0x8e, 0x05, 0x0a,
0xe0, 0x1b, 0x24, 0x00, 0xa5, 0xc2, 0x0f, 0x0d,
0xf5, 0xf4, 0x30, 0xf6, 0xe5, 0x8b, 0xc7, 0xf3,
0xfd, 0xbb, 0xa6, 0x1d, 0x38, 0x40, 0xa9, 0xa2,
0xb4, 0xb5, 0x5d, 0xbe, 0x3c, 0x3a, 0x3a, 0x36,
0x36, 0x32, 0xb2, 0x6e, 0x5d, 0x5e, 0x9e, 0xd3,
0x59, 0x58, 0x68, 0xb1, 0x04, 0x8f, 0x63, 0x7c,
0x1f, 0xec, 0xc5, 0xf8, 0xc2, 0x8b, 0x64, 0x0a,
0x9d, 0xf7, 0x37, 0x02, 0x8a, 0x8b, 0x53, 0x53,
0xcf, 0x9e, 0x35, 0x0e, 0x96, 0x60, 0x53, 0x94,
0xe0, 0x48, 0x18, 0x13, 0x78, 0xbd, 0xa3, 0xa3,
0x00, 0xaa, 0xda, 0xd1, 0x51, 0x5b, 0x4b, 0x69,
0x59, 0x99, 0xaa, 0x1e, 0x3c, 0xd8, 0xdb, 0x5b,
0x56, 0x36, 0x31, 0x31, 0x31, 0x31, 0x36, 0xe6,
0x72, 0xf1, 0x7e, 0x42, 0x88, 0xcf, 0x17, 0x3c,
0x9e, 0x38, 0xba, 0x42, 0xdb, 0xa1, 0x7e, 0x46,
0x01, 0xfc, 0xa7, 0xa9, 0xb6, 0xf6, 0xfe, 0xfd,
0x2b, 0x57, 0x66, 0xfb, 0xf7, 0x18, 0x1c, 0x0c,
0x5e, 0x52, 0x31, 0x90, 0xf8, 0xcf, 0x14, 0x13,
0x13, 0x22, 0x4e, 0x83, 0xee, 0xee, 0xfa, 0x7a,
0x4a, 0xab, 0xab, 0x15, 0xc5, 0xe5, 0x1a, 0x1c,
0x7c, 0xfb, 0x36, 0x2a, 0x2a, 0x2e, 0x0e, 0xe3,
0x7d, 0xfb, 0x78, 0xbf, 0xc9, 0x49, 0xee, 0x35,
0x6d, 0x66, 0x50, 0x31, 0x5e, 0xa8, 0xd0, 0x69,
0xd4, 0x30, 0x2f, 0x13, 0xa0, 0xa2, 0xf8, 0x44,
0x5b, 0x14, 0x95, 0xd8, 0xe6, 0x44, 0xae, 0xe2,
0x59, 0xb6, 0xe9, 0xd0, 0x14, 0x11, 0x81, 0x10,
0xe0, 0x22, 0xf7, 0x05, 0xb0, 0xe8, 0xf7, 0x6f,
0x9b, 0xa7, 0x80, 0x50, 0x33, 0x8a, 0x79, 0xe6,
0x76, 0xe8, 0xbe, 0x3d, 0x1b, 0x78, 0xa8, 0xff,
0x1f, 0xd9, 0xdf, 0xdd, 0x50, 0x87, 0x70, 0x35,
0xc2, 0x80, 0x45, 0x00, 0x00, 0x00, 0x22, 0x7a,
0x54, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77,
0x61, 0x72, 0x65, 0x00, 0x00, 0x78, 0xda, 0x2b,
0x2f, 0x2f, 0xd7, 0xcb, 0xcc, 0xcb, 0x2e, 0x4e,
0x4e, 0x2c, 0x48, 0xd5, 0xcb, 0x2f, 0x4a, 0x07,
0x00, 0x36, 0xd8, 0x06, 0x58, 0x10, 0x53, 0xca,
0x5c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};

252
art/tango/go_home.h Normal file
View File

@@ -0,0 +1,252 @@
/* go_home.png - 606 bytes */
static const unsigned char go_home_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x0a, 0x0e, 0x14, 0x25, 0x13, 0x53,
0x2a, 0xd2, 0x3b, 0x00, 0x00, 0x01, 0xeb, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x93, 0xbf,
0x6b, 0x53, 0x51, 0x14, 0x80, 0xbf, 0x7b, 0xfb,
0xde, 0x4b, 0xd3, 0x40, 0xf2, 0x24, 0xa0, 0x55,
0x87, 0x64, 0x51, 0x7b, 0x13, 0x68, 0x55, 0xac,
0x11, 0x5c, 0x1c, 0x8c, 0x42, 0x13, 0xa7, 0x87,
0xd4, 0x4a, 0x27, 0x91, 0xa2, 0xa3, 0x18, 0x5c,
0x3a, 0xb4, 0x6e, 0xc1, 0xa9, 0xfe, 0x18, 0xea,
0xd4, 0x25, 0x8b, 0xf5, 0xc7, 0x60, 0x13, 0xf0,
0x0f, 0xf0, 0x3f, 0x10, 0x79, 0x5b, 0x5c, 0xc4,
0x5a, 0xdb, 0xf0, 0x62, 0x51, 0x89, 0x21, 0x79,
0xd7, 0x21, 0xf6, 0xd9, 0x97, 0x50, 0x21, 0x67,
0xba, 0x5c, 0xce, 0xf7, 0xdd, 0x73, 0x0e, 0xe7,
0xc2, 0x01, 0xe1, 0x29, 0x55, 0xac, 0x80, 0xae,
0x80, 0xf6, 0x94, 0x7a, 0xc8, 0x30, 0xb1, 0x07,
0x7b, 0x4a, 0x69, 0x4f, 0xa9, 0x3d, 0x49, 0x71,
0x68, 0x78, 0xb1, 0x38, 0xa3, 0xcb, 0x37, 0x6f,
0xfc, 0x57, 0x22, 0xfa, 0xe1, 0x9a, 0xeb, 0x6e,
0x14, 0x94, 0x62, 0xfd, 0xdc, 0x59, 0xb6, 0x27,
0x4e, 0x71, 0xe4, 0xf0, 0x38, 0x27, 0xbc, 0x26,
0x53, 0x6b, 0x6b, 0xd4, 0x5c, 0x97, 0x82, 0x52,
0xd7, 0x0e, 0xb9, 0x6e, 0x75, 0x40, 0xb0, 0x1f,
0x7e, 0x53, 0x9c, 0x61, 0xf7, 0xf8, 0x31, 0x94,
0xca, 0x32, 0x16, 0x8d, 0xd2, 0x6a, 0xb5, 0x18,
0xdb, 0xfc, 0x4a, 0xb6, 0x5c, 0x1e, 0x90, 0x88,
0x7e, 0xb8, 0x7a, 0xfb, 0x16, 0x9d, 0x64, 0x92,
0x74, 0x2a, 0x4d, 0x2a, 0x95, 0x02, 0x40, 0x6b,
0x68, 0xb7, 0xdb, 0xec, 0xd6, 0xeb, 0x9c, 0x2c,
0x95, 0x42, 0x12, 0xb1, 0x1f, 0x7e, 0xf7, 0xa0,
0x44, 0xc7, 0x30, 0xc9, 0xe5, 0x2e, 0x60, 0xdb,
0x76, 0xd0, 0x9a, 0xd6, 0x1a, 0x00, 0xdf, 0xf7,
0xf9, 0xb9, 0xb5, 0x45, 0x72, 0x6e, 0x2e, 0x90,
0x88, 0x0a, 0xe8, 0x82, 0x52, 0xbc, 0x7f, 0x54,
0xc6, 0x6b, 0x36, 0x39, 0x3f, 0x9d, 0x23, 0x1e,
0x8f, 0x23, 0x84, 0x08, 0x09, 0x7c, 0xdf, 0x0f,
0xce, 0x86, 0x10, 0x8c, 0xe6, 0xf3, 0xd4, 0x5c,
0x17, 0x03, 0xb8, 0x03, 0xac, 0x4e, 0x9d, 0x3e,
0xc3, 0xfd, 0xd2, 0x3d, 0x36, 0xaa, 0x6f, 0x03,
0xf0, 0xc9, 0xca, 0x33, 0x56, 0x1e, 0x3f, 0x45,
0x8b, 0x11, 0x74, 0xa7, 0x85, 0x30, 0x46, 0xd1,
0xdd, 0xdf, 0x2c, 0x2f, 0x2d, 0xd1, 0xee, 0xa5,
0xcc, 0xca, 0x79, 0x78, 0xbe, 0x30, 0x99, 0x21,
0x11, 0x4f, 0x00, 0xa0, 0xd4, 0x04, 0x99, 0x8c,
0x22, 0x9b, 0xcd, 0xf4, 0x5e, 0x14, 0x92, 0x91,
0xf4, 0x95, 0xde, 0xc4, 0x53, 0x79, 0x90, 0x16,
0x5a, 0x6b, 0x16, 0x26, 0x33, 0xcc, 0xc3, 0xba,
0xec, 0xef, 0xd3, 0xb2, 0x2c, 0x4c, 0xd3, 0xc4,
0x30, 0x8c, 0xe0, 0xfe, 0x4b, 0xe3, 0x07, 0x00,
0x1f, 0xea, 0x3b, 0x74, 0xbb, 0x7e, 0x90, 0x0b,
0x30, 0x20, 0x90, 0x52, 0x22, 0xa5, 0xc4, 0x92,
0x9f, 0x01, 0xe8, 0x60, 0xf1, 0xf1, 0x53, 0x03,
0x80, 0x6f, 0xde, 0x2f, 0x3a, 0x22, 0x12, 0x5a,
0x24, 0x63, 0x60, 0xb3, 0xfe, 0x0e, 0xcf, 0xe7,
0x28, 0x00, 0x97, 0x2e, 0x4e, 0x73, 0x35, 0x1a,
0x43, 0xea, 0x71, 0x2e, 0x4b, 0x93, 0xed, 0x4d,
0x42, 0x15, 0x18, 0xfd, 0x15, 0xfc, 0x9b, 0x7e,
0xef, 0xa5, 0xef, 0xde, 0x0e, 0xa2, 0xd9, 0x38,
0x70, 0xf5, 0x03, 0x41, 0x24, 0x12, 0xc1, 0xb6,
0x6d, 0x12, 0x89, 0x04, 0x02, 0x89, 0x10, 0x10,
0x8b, 0xc5, 0x70, 0x1c, 0x67, 0x00, 0xb2, 0x2c,
0x2b, 0xfc, 0x17, 0xae, 0xcf, 0x3a, 0xaf, 0x00,
0x87, 0xe1, 0x62, 0xf5, 0xe5, 0x8b, 0xd7, 0x77,
0xff, 0x00, 0x56, 0xf8, 0xd5, 0xa3, 0x85, 0xbb,
0x80, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
/* go_home.png - 1354 bytes */
static const unsigned char go_home_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
0xd5, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xdd,
0x55, 0xcf, 0x4f, 0x53, 0x4b, 0x14, 0xfe, 0x66,
0x7a, 0xef, 0x2d, 0x2d, 0xc5, 0x96, 0x02, 0x4a,
0x31, 0xd2, 0xc6, 0xc4, 0x48, 0x23, 0x21, 0x1a,
0x83, 0x90, 0xb0, 0x71, 0xa1, 0x68, 0x48, 0x03,
0x26, 0x8d, 0x81, 0xf8, 0x23, 0xfd, 0x0b, 0xba,
0x32, 0x25, 0x46, 0x83, 0xff, 0x40, 0x63, 0x82,
0x42, 0x74, 0xa5, 0x62, 0x74, 0x81, 0x51, 0x12,
0x4a, 0xc2, 0x86, 0x35, 0x0b, 0x16, 0x2e, 0xa4,
0x56, 0x5c, 0x48, 0x94, 0x05, 0x29, 0x84, 0x1f,
0x2d, 0x28, 0xa5, 0x85, 0xde, 0x76, 0xde, 0x62,
0x32, 0xef, 0x96, 0x7b, 0xb9, 0xa1, 0x82, 0x79,
0x2f, 0xef, 0x9d, 0xcd, 0xc9, 0x99, 0x3b, 0x73,
0xe6, 0xfb, 0xe6, 0x7c, 0xf7, 0x1c, 0xe0, 0x3f,
0x6e, 0xe4, 0x4f, 0x27, 0x7c, 0xfb, 0x16, 0x00,
0x3c, 0x1e, 0x1e, 0x25, 0x93, 0x7b, 0xbf, 0x5e,
0xb8, 0x70, 0xe7, 0x0e, 0x00, 0x7c, 0xfa, 0xf4,
0x6f, 0x13, 0x37, 0x01, 0x7e, 0xf1, 0x22, 0xf7,
0x8c, 0x6d, 0x6d, 0x45, 0x22, 0x91, 0x88, 0xe6,
0xc5, 0xfa, 0x5e, 0x82, 0x47, 0xb7, 0x23, 0x57,
0x40, 0x00, 0xe7, 0xd1, 0xc7, 0x8f, 0x37, 0x6e,
0x44, 0x22, 0x91, 0x88, 0xf9, 0xfe, 0xf1, 0xf1,
0x68, 0x34, 0x1a, 0x15, 0x51, 0x43, 0x03, 0xaf,
0xc8, 0xd2, 0xd2, 0x61, 0xef, 0xa7, 0x7f, 0x1a,
0xf8, 0xe6, 0xe6, 0xf4, 0xf4, 0xf4, 0xb4, 0x71,
0x7f, 0x2a, 0x35, 0x31, 0x31, 0x31, 0x01, 0xec,
0x25, 0x98, 0x4c, 0x1e, 0xb5, 0x22, 0xbf, 0x4d,
0xc0, 0x0c, 0x78, 0x2e, 0x37, 0x3b, 0x3b, 0x3b,
0x0b, 0x38, 0x1c, 0x35, 0x35, 0x35, 0x35, 0xe6,
0xe7, 0xff, 0x34, 0x91, 0xb2, 0x25, 0x64, 0x06,
0x5c, 0x55, 0xe7, 0xe7, 0xe7, 0xe7, 0x01, 0x4a,
0x25, 0x49, 0x92, 0x00, 0x4a, 0x7d, 0x3e, 0x9f,
0x4f, 0x2f, 0x15, 0x0d, 0xf0, 0xda, 0x5a, 0x2c,
0x16, 0x8b, 0x01, 0x94, 0x12, 0x42, 0x08, 0xe0,
0x76, 0x77, 0x77, 0x77, 0x77, 0x1f, 0x5e, 0x5a,
0x07, 0x56, 0xc0, 0x0c, 0x38, 0x63, 0xc9, 0x64,
0x32, 0x09, 0x50, 0x5a, 0x55, 0x55, 0x55, 0x65,
0x04, 0xfe, 0xf5, 0x6b, 0x20, 0xd0, 0xd5, 0x05,
0x2c, 0x2e, 0xde, 0xba, 0xd5, 0xd7, 0xa7, 0xad,
0xd7, 0xd6, 0xf6, 0xf4, 0xf4, 0xf4, 0x00, 0xaa,
0xca, 0x18, 0x63, 0x47, 0xaf, 0x88, 0x69, 0x05,
0x78, 0x02, 0xfe, 0x0e, 0xc0, 0x9b, 0x37, 0x1a,
0xf0, 0x74, 0x3a, 0x9d, 0x2e, 0x49, 0x40, 0xaa,
0xab, 0xab, 0xab, 0x35, 0x80, 0x99, 0xcc, 0xdd,
0xbb, 0xb7, 0x6f, 0x03, 0xab, 0xab, 0x4d, 0x4d,
0x67, 0xcf, 0x02, 0x27, 0x4e, 0x1c, 0x3f, 0x5e,
0x5f, 0x0f, 0x9c, 0x39, 0x93, 0x4e, 0x6f, 0x6c,
0x00, 0x8b, 0x8b, 0xfd, 0xfd, 0xfd, 0xfd, 0x1a,
0xe0, 0xe5, 0x65, 0x5e, 0x11, 0x45, 0x39, 0x5c,
0x45, 0x0e, 0x20, 0xc0, 0x98, 0xf6, 0x32, 0xd9,
0x6c, 0x36, 0x0b, 0x00, 0xbb, 0xbb, 0xbb, 0xbb,
0x00, 0xe0, 0x74, 0x3a, 0x9d, 0xda, 0x45, 0x3b,
0x3b, 0x91, 0xc8, 0xbd, 0x7b, 0xc0, 0xcf, 0x9f,
0x27, 0x4f, 0x36, 0x34, 0x00, 0x7e, 0xbf, 0xdf,
0x7f, 0xee, 0x1c, 0x60, 0xb7, 0xdb, 0x6c, 0x36,
0x1b, 0x90, 0xcb, 0xe5, 0x72, 0xb9, 0x1c, 0x60,
0xb7, 0x2f, 0x2d, 0x2d, 0x2f, 0x03, 0x0b, 0x0b,
0xa1, 0x50, 0x28, 0x54, 0x4a, 0x64, 0x7c, 0x7c,
0x7c, 0x1c, 0x50, 0x14, 0x4a, 0x29, 0x35, 0x12,
0xe1, 0x04, 0x88, 0x01, 0xaf, 0xb4, 0x3f, 0xf0,
0x8a, 0x0a, 0xfd, 0x3a, 0x63, 0x9c, 0x00, 0x21,
0x6e, 0xb7, 0xdb, 0xad, 0x25, 0x66, 0xec, 0xf1,
0xe3, 0x68, 0x14, 0xa0, 0x94, 0xff, 0xbc, 0xe7,
0xcf, 0x7b, 0xbd, 0x3e, 0x1f, 0xe0, 0xf5, 0x7a,
0xbd, 0x5e, 0x6f, 0xe9, 0x79, 0xc6, 0x38, 0xfd,
0x53, 0xa7, 0x1a, 0x1b, 0x01, 0x59, 0x9e, 0x9c,
0x9c, 0x9c, 0x04, 0x46, 0x47, 0x83, 0xc1, 0x60,
0x10, 0xe8, 0xeb, 0x0b, 0x87, 0xc3, 0x61, 0x8d,
0x48, 0xb9, 0x26, 0xed, 0xbf, 0x6c, 0xb7, 0x1b,
0x4a, 0xa5, 0x03, 0x6e, 0xb1, 0xbc, 0x7a, 0xf5,
0xe2, 0x05, 0xa0, 0xaa, 0x92, 0x24, 0xcb, 0x40,
0x47, 0x47, 0x5b, 0x5b, 0x7b, 0x3b, 0xe0, 0x72,
0xb9, 0x5c, 0x2e, 0x97, 0x31, 0x23, 0x63, 0x82,
0x02, 0x37, 0xb1, 0xaf, 0xa6, 0x66, 0x66, 0x66,
0x66, 0x06, 0x18, 0x1d, 0x6d, 0x6f, 0x6f, 0x6f,
0xd7, 0x88, 0x94, 0x6b, 0x65, 0xb7, 0xd1, 0xc1,
0xc1, 0xb1, 0xb1, 0x0f, 0x1f, 0x80, 0x42, 0x61,
0x64, 0xe4, 0xe5, 0x4b, 0x20, 0x9f, 0xe7, 0x5d,
0xa7, 0xb5, 0xb5, 0xb5, 0xf5, 0xd2, 0x25, 0xc0,
0xe1, 0x70, 0x38, 0x1c, 0x0e, 0xa0, 0x50, 0x28,
0x14, 0x0a, 0x05, 0x73, 0x9f, 0xcf, 0xe7, 0xf3,
0xf9, 0xbc, 0x16, 0x5b, 0xad, 0xbc, 0x72, 0x9d,
0x9d, 0x73, 0x73, 0x73, 0x73, 0xc0, 0xe8, 0xe8,
0xd0, 0xd0, 0xd0, 0x90, 0xf1, 0x7e, 0xae, 0x0c,
0x6a, 0xc0, 0x6b, 0xfa, 0x0f, 0x4c, 0x4d, 0xb5,
0xb4, 0xb4, 0xb4, 0x84, 0x42, 0x2b, 0x2b, 0xf1,
0x78, 0x3c, 0x3e, 0x32, 0xd2, 0xd6, 0x36, 0x3f,
0xff, 0xed, 0x1b, 0xf0, 0xe0, 0xc1, 0xc3, 0x87,
0xf7, 0xef, 0x1f, 0x4c, 0x78, 0x78, 0xf8, 0xe9,
0xd3, 0x67, 0xcf, 0x80, 0x62, 0xb1, 0x58, 0x2c,
0x16, 0x81, 0xc1, 0xc1, 0x27, 0x4f, 0x86, 0x86,
0x00, 0xc6, 0x08, 0xb1, 0x58, 0x00, 0xc6, 0x54,
0x35, 0x97, 0x03, 0x08, 0x91, 0xa4, 0x8a, 0x0a,
0x80, 0xb1, 0x42, 0x61, 0x67, 0x07, 0x78, 0xf4,
0x68, 0x60, 0x60, 0x60, 0x00, 0x88, 0xc5, 0x78,
0x77, 0xab, 0xad, 0x6d, 0x6e, 0x6e, 0x6e, 0x0e,
0x87, 0xaf, 0x5f, 0x4f, 0x24, 0x12, 0x89, 0xe1,
0xe1, 0x32, 0x25, 0x04, 0x74, 0x76, 0xc6, 0xe3,
0xf1, 0xf8, 0xeb, 0xd7, 0x37, 0x6f, 0xf6, 0xf6,
0x06, 0x83, 0x23, 0x23, 0x5d, 0x5d, 0x6e, 0x77,
0xe9, 0x80, 0xf2, 0xfb, 0xfd, 0xfe, 0xa6, 0x26,
0x80, 0x10, 0xde, 0x3d, 0x84, 0x17, 0x26, 0x5e,
0x58, 0x48, 0x87, 0x31, 0x42, 0x28, 0x05, 0x2c,
0x16, 0x9f, 0xaf, 0xb3, 0x93, 0xcf, 0x8f, 0x89,
0x09, 0x80, 0x10, 0xaf, 0xf7, 0xea, 0x55, 0x80,
0xb1, 0x85, 0x85, 0xa9, 0x29, 0x6d, 0x7f, 0x2c,
0xd6, 0xdb, 0x1b, 0x0c, 0x02, 0x3e, 0x5f, 0x63,
0xe3, 0xe9, 0xd3, 0xcf, 0x9f, 0x03, 0x89, 0x44,
0x22, 0x71, 0x04, 0x09, 0xe9, 0x35, 0xac, 0x28,
0x8a, 0xa2, 0x28, 0x80, 0x2c, 0xcb, 0xb2, 0x2c,
0x03, 0x92, 0xc4, 0x25, 0x25, 0x62, 0xf1, 0xf2,
0x7a, 0x22, 0xc9, 0xe4, 0xfa, 0xfa, 0xd6, 0x96,
0x96, 0xe7, 0xf3, 0xe7, 0xef, 0xdf, 0xd7, 0xd6,
0xf8, 0xbe, 0x62, 0xd1, 0x78, 0x4f, 0x34, 0x1a,
0x8d, 0x46, 0xa3, 0xa5, 0x2b, 0xbf, 0x45, 0x40,
0xfa, 0xbb, 0x42, 0xfa, 0xc4, 0x94, 0xf2, 0x76,
0x27, 0xbc, 0xa2, 0x50, 0xba, 0xb8, 0x08, 0x48,
0x12, 0x21, 0xa9, 0x94, 0x46, 0x40, 0x78, 0x55,
0x05, 0x14, 0x05, 0xf8, 0xf2, 0xe5, 0xc7, 0x8f,
0xf5, 0x75, 0x2d, 0xcf, 0xca, 0x4a, 0x3a, 0xbd,
0xbd, 0x0d, 0xa8, 0x2a, 0x21, 0x56, 0xab, 0xf1,
0x1e, 0x6e, 0xa2, 0x2b, 0x96, 0xd1, 0x46, 0xb9,
0x59, 0x2c, 0xdc, 0x57, 0x56, 0x9a, 0x11, 0xd0,
0x4b, 0xa6, 0x58, 0xe4, 0x73, 0x33, 0x9b, 0xcd,
0xe5, 0x4a, 0x81, 0x7b, 0x3c, 0x1e, 0x8f, 0xc7,
0x03, 0x5c, 0xbe, 0xdc, 0xd1, 0xd1, 0xda, 0x0a,
0x5c, 0xbb, 0x66, 0xb3, 0x55, 0x56, 0x02, 0x94,
0x32, 0x56, 0x5f, 0x0f, 0x5c, 0xb9, 0x42, 0xa9,
0x2c, 0x03, 0xab, 0xab, 0x7c, 0x48, 0xed, 0x4f,
0x40, 0x88, 0x57, 0x0c, 0x32, 0x55, 0x35, 0x21,
0x20, 0x20, 0x89, 0x97, 0x2f, 0x9f, 0x00, 0x00,
0x58, 0xad, 0x00, 0x1f, 0x5b, 0x1a, 0x01, 0x61,
0x9b, 0x9b, 0xe9, 0xf4, 0xda, 0x1a, 0x40, 0xc8,
0xc6, 0x46, 0x69, 0x05, 0xf4, 0x96, 0x4a, 0xa5,
0x52, 0xa9, 0x94, 0x7e, 0x95, 0x98, 0x36, 0x1b,
0x93, 0x0a, 0x88, 0x03, 0x5a, 0xdb, 0x12, 0x9a,
0x17, 0xfd, 0xdb, 0xe9, 0xe4, 0x93, 0x98, 0x10,
0xbe, 0xab, 0x94, 0x0e, 0x21, 0x40, 0x5d, 0x5d,
0x5d, 0x5d, 0x5d, 0x1d, 0x90, 0xc9, 0x64, 0x32,
0x99, 0x0c, 0x10, 0x08, 0x04, 0x02, 0x81, 0x00,
0x0e, 0x34, 0xbb, 0xdd, 0x6e, 0x37, 0x4e, 0xa1,
0x4c, 0x46, 0x3c, 0xa3, 0x01, 0xe9, 0xfe, 0xc0,
0x85, 0x84, 0xaa, 0xaa, 0x78, 0x17, 0x32, 0xbe,
0xc9, 0x3f, 0x65, 0xef, 0xdf, 0xbf, 0x7b, 0x37,
0x36, 0x26, 0xcb, 0x3c, 0xd2, 0xa4, 0x63, 0x42,
0x40, 0x4f, 0x44, 0x48, 0xc9, 0x6a, 0xe5, 0x5e,
0xfc, 0x4c, 0xc7, 0x8e, 0x71, 0x2f, 0xb4, 0x59,
0x5b, 0xcb, 0x3d, 0x97, 0x8f, 0x76, 0xae, 0x50,
0xd8, 0x9b, 0x57, 0xf4, 0x1f, 0xb1, 0x9e, 0xcf,
0x73, 0xbf, 0xb1, 0xc1, 0xfd, 0xaf, 0x5f, 0xdc,
0xaf, 0xae, 0x72, 0xbf, 0xbd, 0xbd, 0x7f, 0x9e,
0x03, 0x09, 0xe8, 0x89, 0xe8, 0x63, 0x21, 0x2d,
0x11, 0x8b, 0x17, 0x12, 0xb1, 0xfe, 0x9c, 0x1e,
0x80, 0x90, 0x82, 0xf0, 0xe2, 0xbb, 0xf0, 0xe6,
0x6d, 0xf3, 0x7f, 0x67, 0x7f, 0x01, 0x78, 0xb4,
0xac, 0x22, 0x26, 0x29, 0xea, 0x45, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};

276
art/tango/go_last.h Normal file
View File

@@ -0,0 +1,276 @@
/* go_last.png - 685 bytes */
static const unsigned char go_last_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
0x02, 0x3f, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
0x95, 0x93, 0x4d, 0x48, 0x94, 0x51, 0x14, 0x86,
0x9f, 0xfb, 0xdd, 0x7b, 0x3f, 0xc7, 0xd1, 0xa2,
0x60, 0xb2, 0x08, 0x8d, 0x2c, 0x28, 0x08, 0xd2,
0x16, 0x05, 0xe1, 0x48, 0x44, 0x04, 0x2d, 0xb4,
0x45, 0x42, 0x8b, 0x68, 0x63, 0x50, 0x04, 0xad,
0xa2, 0x46, 0x11, 0x5a, 0xe4, 0xaa, 0x4d, 0xc2,
0xe0, 0xa2, 0x5c, 0x54, 0x10, 0x04, 0x69, 0xe4,
0x22, 0x22, 0xfb, 0x33, 0x88, 0x16, 0xa3, 0xd2,
0x1f, 0x62, 0xb5, 0x29, 0x82, 0x82, 0xd0, 0xf9,
0x61, 0x4a, 0xd3, 0xd1, 0xe9, 0xfb, 0xe6, 0xbb,
0xb7, 0x85, 0x69, 0x6a, 0x63, 0xd4, 0x0b, 0x77,
0x73, 0xce, 0xe1, 0x81, 0xfb, 0xbe, 0xe7, 0x08,
0x6b, 0x2d, 0x4b, 0x55, 0xdf, 0xaa, 0x13, 0xd6,
0x70, 0x3d, 0xd1, 0xe1, 0x5f, 0xf9, 0xa3, 0xf9,
0x4b, 0xd1, 0x98, 0xb6, 0x00, 0x4e, 0xb1, 0xa6,
0x35, 0xd4, 0x55, 0x56, 0x6c, 0xee, 0x8c, 0xb6,
0xe8, 0xdb, 0xd1, 0x98, 0x2e, 0x5f, 0x0e, 0xb2,
0x2c, 0x00, 0xe0, 0x54, 0x53, 0x7b, 0xe9, 0xfe,
0x5d, 0x87, 0x0e, 0x22, 0x78, 0x17, 0x8d, 0xe9,
0xed, 0xff, 0x0d, 0x90, 0x42, 0xb1, 0xa7, 0xb6,
0xa1, 0xe4, 0x54, 0x53, 0x7b, 0x55, 0x38, 0xb4,
0x62, 0x28, 0x1a, 0xd3, 0x27, 0x8a, 0xcd, 0xa9,
0x68, 0x8b, 0x4e, 0x62, 0x59, 0xbb, 0xb0, 0x28,
0x24, 0x79, 0x63, 0x4d, 0x68, 0x64, 0xf4, 0x29,
0xd5, 0x91, 0x1a, 0xd1, 0x7a, 0x34, 0x1e, 0xee,
0xe9, 0xbf, 0xd4, 0x59, 0xdf, 0xa2, 0x0f, 0x58,
0x4b, 0x73, 0xa2, 0xc3, 0x9f, 0x9a, 0x9f, 0xad,
0x3b, 0xab, 0x6c, 0x5b, 0x73, 0x1c, 0x47, 0x48,
0xa4, 0xa3, 0x90, 0x42, 0x21, 0x1d, 0x89, 0x94,
0x92, 0xe7, 0x5f, 0xee, 0xa1, 0x1c, 0xc5, 0xea,
0xd2, 0xf5, 0x6c, 0x5c, 0x55, 0xc3, 0xe0, 0xdb,
0x27, 0x7e, 0xdf, 0xc0, 0xcd, 0x31, 0x6b, 0x4c,
0x23, 0x30, 0x02, 0xa0, 0x00, 0x8c, 0x09, 0x78,
0xfc, 0xfe, 0x1a, 0x5a, 0x96, 0xa0, 0x95, 0x4b,
0x89, 0x1b, 0xc2, 0x75, 0x5d, 0x94, 0xd4, 0x08,
0x21, 0xc9, 0xe6, 0x3f, 0xf1, 0x3d, 0x9d, 0xa6,
0x66, 0xeb, 0x4e, 0x5d, 0x59, 0x51, 0x5d, 0xd5,
0xfd, 0xe8, 0xf2, 0xd0, 0x44, 0x2e, 0xfb, 0xdb,
0x83, 0x82, 0xf1, 0xc8, 0xe6, 0x46, 0x19, 0x9b,
0xf8, 0x48, 0x32, 0xf7, 0x81, 0xac, 0xf7, 0x99,
0xc9, 0x20, 0x4d, 0x41, 0xe4, 0x08, 0x64, 0x9e,
0x82, 0x33, 0xc3, 0xb4, 0xc9, 0x32, 0x9c, 0x7a,
0x48, 0xe0, 0xe6, 0xc4, 0xc9, 0xa6, 0x73, 0xe1,
0x79, 0x0f, 0x00, 0x66, 0xfc, 0x29, 0x72, 0xde,
0x38, 0x8e, 0x12, 0x18, 0xeb, 0x50, 0xf0, 0x27,
0x99, 0x12, 0x63, 0x64, 0x0a, 0x02, 0xad, 0x42,
0xb8, 0xa2, 0x14, 0x4d, 0x19, 0x4e, 0xe0, 0xb2,
0xd2, 0x8b, 0xa0, 0x4c, 0x29, 0x8b, 0x00, 0xf3,
0x91, 0x48, 0x81, 0x23, 0x05, 0x52, 0x09, 0x94,
0x16, 0x28, 0xd7, 0x41, 0x38, 0x3e, 0x9e, 0xf1,
0x30, 0x41, 0x81, 0xda, 0x35, 0x0d, 0x8c, 0xa7,
0x73, 0xf6, 0xce, 0xb3, 0xf8, 0x0c, 0x10, 0x5e,
0x04, 0x38, 0xbc, 0xa3, 0x0d, 0xa9, 0xc5, 0xec,
0x53, 0x02, 0xa9, 0x1c, 0xfa, 0x93, 0x71, 0x1c,
0x25, 0x88, 0xa8, 0x4d, 0x6c, 0x29, 0xdb, 0xc7,
0xd0, 0xcb, 0x01, 0xef, 0xd5, 0xc8, 0x60, 0xd2,
0x1a, 0x16, 0x98, 0x28, 0x48, 0x75, 0xdd, 0xba,
0xb0, 0x28, 0x46, 0xe9, 0x92, 0x3f, 0x73, 0xfc,
0x7c, 0x48, 0x2a, 0xc9, 0xb6, 0xc8, 0x5e, 0xca,
0xbd, 0x0d, 0xf4, 0xde, 0xed, 0x9e, 0x4e, 0x65,
0x47, 0x1f, 0x58, 0x33, 0x1b, 0x63, 0x34, 0xa6,
0x67, 0xbf, 0x90, 0xb8, 0xe8, 0xaf, 0x5b, 0xba,
0x1c, 0x73, 0x7b, 0xbe, 0x3b, 0x72, 0x84, 0x64,
0x32, 0x63, 0x7b, 0xfa, 0xba, 0x66, 0x7c, 0xcf,
0x3b, 0x5d, 0xec, 0x36, 0xd4, 0xd2, 0xc2, 0x9c,
0xfc, 0x82, 0xc7, 0xe0, 0x8b, 0xa1, 0x1f, 0xc3,
0x23, 0xaf, 0x53, 0x26, 0xa0, 0x31, 0xd1, 0xe1,
0xbf, 0x29, 0x36, 0xb7, 0x2c, 0xe0, 0x46, 0xef,
0xd5, 0xe9, 0x6f, 0x13, 0x99, 0xfb, 0x26, 0xe0,
0xd8, 0xc2, 0xcd, 0xfb, 0x27, 0x80, 0x90, 0x0c,
0x64, 0xbf, 0x66, 0xfe, 0x7a, 0xce, 0x73, 0xfa,
0x09, 0xc7, 0xf5, 0xe4, 0x41, 0xd6, 0x0e, 0xe2,
0x73, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};
/* go_last.png - 1468 bytes */
static const unsigned char go_last_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
0x19, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x5d, 0x48, 0x54, 0x5b, 0x14, 0xfe, 0xf6,
0x3e, 0xe7, 0x38, 0xc7, 0xa9, 0x0c, 0x14, 0xc6,
0x4a, 0xac, 0x04, 0x11, 0xf2, 0x41, 0x0a, 0x4a,
0x74, 0x84, 0xa2, 0x20, 0xa1, 0x88, 0x8a, 0x30,
0xc1, 0xa7, 0x20, 0xe8, 0xe7, 0x21, 0x88, 0x70,
0x84, 0x0c, 0xf1, 0xa9, 0xb2, 0x87, 0xa2, 0x87,
0x08, 0x91, 0x10, 0x8b, 0x28, 0x1d, 0xa5, 0x50,
0x2a, 0xa4, 0x19, 0xc1, 0x9a, 0xc4, 0x28, 0xc9,
0x4c, 0x27, 0xa7, 0x44, 0x2d, 0x63, 0xca, 0xd1,
0xd4, 0x06, 0xb3, 0xe6, 0xcc, 0xcc, 0xf9, 0xb9,
0x0f, 0xfb, 0xee, 0x3b, 0xfe, 0xcc, 0xd4, 0x68,
0xbe, 0x5c, 0x68, 0xc1, 0xb0, 0x58, 0xe7, 0xec,
0xbd, 0xf6, 0xf7, 0xad, 0xb5, 0xd7, 0x5a, 0x67,
0x80, 0xbf, 0xf2, 0x57, 0xfe, 0x48, 0xc8, 0x72,
0x39, 0x2a, 0x28, 0x28, 0x2b, 0x13, 0xc5, 0x27,
0x4f, 0x0c, 0x43, 0xd7, 0x81, 0x6b, 0xd7, 0x3a,
0x3b, 0xaf, 0x5c, 0x51, 0xd5, 0x7b, 0xf7, 0x16,
0xeb, 0xc7, 0x6a, 0xb5, 0xd9, 0x44, 0x71, 0x64,
0x04, 0x30, 0x0c, 0x60, 0xfd, 0xfa, 0x28, 0x90,
0x09, 0x30, 0x36, 0xd6, 0xd9, 0x79, 0xf9, 0xb2,
0xaa, 0xae, 0x59, 0x23, 0x2e, 0x17, 0x01, 0x06,
0x7c, 0xc7, 0x8e, 0xf4, 0x74, 0x8b, 0x25, 0x33,
0x33, 0x37, 0xd7, 0x6a, 0xb5, 0xd9, 0x06, 0x07,
0xb7, 0x6d, 0x63, 0x40, 0xca, 0xcb, 0x19, 0x21,
0xc3, 0x88, 0xc7, 0x13, 0xb0, 0x6e, 0xdd, 0xc9,
0x93, 0xc5, 0xc5, 0xe5, 0xe5, 0x00, 0x21, 0x84,
0x90, 0x59, 0x61, 0xae, 0xae, 0xb6, 0xdb, 0x2f,
0x5e, 0x4c, 0x4d, 0xe5, 0x36, 0x5d, 0x2e, 0x02,
0x5c, 0x8e, 0x1f, 0x3f, 0x78, 0xb0, 0xa2, 0x22,
0x31, 0x71, 0xcb, 0x96, 0xac, 0xac, 0x82, 0x82,
0xd3, 0xa7, 0x09, 0xa1, 0x14, 0x70, 0x3a, 0xad,
0xd6, 0xd2, 0x52, 0x51, 0x5c, 0xb5, 0x6a, 0xb1,
0xfe, 0x9a, 0x9a, 0x7a, 0x7a, 0x2e, 0x5d, 0x8a,
0xfd, 0x7e, 0xd9, 0x09, 0x88, 0x22, 0xa5, 0xa2,
0x08, 0xec, 0xdd, 0x6b, 0xb5, 0x96, 0x94, 0xc8,
0x72, 0x61, 0x61, 0x5e, 0x5e, 0x51, 0xd1, 0xf6,
0xed, 0x8c, 0x88, 0xdb, 0xcd, 0x88, 0x64, 0x66,
0x2e, 0xdb, 0x79, 0xb1, 0x5e, 0xb0, 0xbb, 0xe8,
0xf3, 0xb1, 0x94, 0x46, 0x52, 0x16, 0x4b, 0x08,
0x11, 0x04, 0x40, 0x51, 0x34, 0xcd, 0x30, 0x54,
0x55, 0x96, 0xbb, 0xbb, 0xbd, 0x5e, 0x87, 0x03,
0xd8, 0xb4, 0x29, 0x23, 0x23, 0x37, 0x57, 0x92,
0x52, 0x52, 0x56, 0xaf, 0xb6, 0x58, 0xd2, 0xd3,
0x1b, 0x1b, 0x9d, 0xce, 0xda, 0xda, 0x57, 0xaf,
0xac, 0xd6, 0xd2, 0x52, 0xa0, 0xb8, 0x98, 0x5d,
0xad, 0xc7, 0x8f, 0x97, 0x9d, 0x00, 0x07, 0x7e,
0xe1, 0xc2, 0x89, 0x13, 0xb7, 0x6e, 0x71, 0x90,
0x0b, 0x57, 0x44, 0x7e, 0x86, 0xa1, 0xeb, 0xb2,
0xac, 0xeb, 0x86, 0xa1, 0xaa, 0x40, 0x28, 0x64,
0x18, 0x33, 0x33, 0x40, 0x4f, 0xcf, 0xd8, 0x98,
0xc3, 0x01, 0x64, 0x64, 0x24, 0x27, 0xe7, 0xe4,
0x10, 0x72, 0xec, 0xd8, 0xa1, 0x43, 0x36, 0x5b,
0x52, 0x52, 0x7d, 0x7d, 0x6b, 0x6b, 0x4d, 0xcd,
0xfd, 0xfb, 0x56, 0xab, 0xcd, 0x36, 0x31, 0x71,
0xfe, 0x3c, 0x2b, 0xca, 0xaa, 0xaa, 0x65, 0x24,
0xc0, 0x44, 0x55, 0x75, 0x3d, 0x1c, 0x06, 0x9e,
0x3d, 0x1b, 0x1a, 0x6a, 0x6c, 0x8c, 0x06, 0x9e,
0x95, 0x2f, 0x40, 0x08, 0x2b, 0x51, 0x41, 0xd0,
0x34, 0xc0, 0x30, 0x28, 0x55, 0x55, 0xb6, 0x46,
0xd3, 0x80, 0x81, 0x81, 0x6f, 0xdf, 0x9e, 0x3f,
0x07, 0x2c, 0x16, 0xb3, 0x79, 0xc3, 0x06, 0xe0,
0xc8, 0x91, 0x03, 0x07, 0x4e, 0x9d, 0x32, 0x9b,
0x5b, 0x5a, 0xda, 0xdb, 0xef, 0xde, 0xad, 0xa8,
0x20, 0xa4, 0xac, 0x6c, 0x60, 0x20, 0x37, 0x97,
0x79, 0x23, 0x71, 0x77, 0xc7, 0xdf, 0x12, 0xd0,
0x34, 0x5d, 0x57, 0x55, 0x20, 0x18, 0x54, 0xd5,
0x9f, 0x3f, 0xa3, 0xad, 0x20, 0x84, 0x1d, 0x29,
0x8a, 0xcc, 0x62, 0xb6, 0x61, 0x50, 0xca, 0x88,
0x10, 0xc2, 0x34, 0xcb, 0xcc, 0x97, 0x2f, 0x81,
0x40, 0x7f, 0x3f, 0xe0, 0xf7, 0x07, 0x83, 0xa3,
0xa3, 0xc0, 0xbe, 0x7d, 0xbb, 0x76, 0x15, 0x15,
0x99, 0xcd, 0x2f, 0x5e, 0xf4, 0xf4, 0xb8, 0x5c,
0x7b, 0xf6, 0x74, 0x75, 0xf5, 0xf5, 0x75, 0x74,
0x44, 0xcb, 0xf7, 0x12, 0x09, 0x70, 0xe0, 0x5e,
0xaf, 0xdf, 0xff, 0xfe, 0x3d, 0x10, 0x0a, 0x69,
0x5a, 0x20, 0x10, 0x89, 0xbc, 0x2c, 0xcb, 0xb2,
0x2c, 0x03, 0x66, 0xb3, 0xd9, 0xbc, 0x62, 0x05,
0x60, 0x36, 0xcb, 0xb2, 0xd9, 0x0c, 0x48, 0x92,
0x20, 0x24, 0x24, 0x00, 0x84, 0x50, 0xca, 0x9b,
0x27, 0xcb, 0x08, 0x21, 0xe1, 0x30, 0xe0, 0xf7,
0xab, 0xaa, 0xd7, 0x0b, 0x74, 0x76, 0x7a, 0xbd,
0x76, 0x3b, 0x90, 0x93, 0x93, 0x9d, 0x5d, 0x58,
0x68, 0x32, 0xa5, 0xa6, 0xa6, 0xa5, 0x25, 0x27,
0x33, 0xf8, 0xf1, 0x50, 0xf8, 0x2d, 0x81, 0xe9,
0x69, 0x45, 0x99, 0x98, 0x00, 0xbe, 0x7f, 0x0f,
0x06, 0x27, 0x27, 0x67, 0xc7, 0x5d, 0x10, 0xf8,
0x65, 0x0a, 0x85, 0x00, 0x4d, 0x53, 0xd5, 0x99,
0x19, 0x20, 0x10, 0x08, 0x85, 0x28, 0x05, 0x04,
0xc1, 0x30, 0x28, 0x05, 0x4c, 0x26, 0x49, 0x32,
0x99, 0x00, 0x41, 0x60, 0xdd, 0x89, 0x10, 0xb6,
0x53, 0xd3, 0x58, 0xa6, 0x28, 0xa5, 0x94, 0x65,
0x8c, 0x10, 0x55, 0x05, 0x00, 0x4e, 0x98, 0xc6,
0xd5, 0x21, 0x97, 0xdc, 0x46, 0x29, 0xa5, 0x94,
0x90, 0xd9, 0x5a, 0x10, 0x08, 0x01, 0x04, 0x41,
0x14, 0x09, 0x01, 0x44, 0x51, 0x92, 0x58, 0x04,
0x25, 0x29, 0x1c, 0x06, 0x74, 0x5d, 0x92, 0x14,
0x05, 0x50, 0x55, 0x41, 0x98, 0x99, 0x01, 0x56,
0xae, 0x4c, 0x4c, 0x4c, 0x4a, 0x02, 0xf2, 0xf3,
0xd3, 0xd3, 0x8b, 0x8a, 0x80, 0xb7, 0x6f, 0x3d,
0x1e, 0xb7, 0x3b, 0x18, 0x7c, 0xf8, 0xb0, 0xb5,
0xf5, 0xc1, 0x03, 0x5d, 0x8f, 0xb7, 0x0a, 0x96,
0x3c, 0x89, 0xf9, 0x7c, 0x24, 0x84, 0x11, 0x88,
0x68, 0x46, 0x84, 0x52, 0x46, 0x44, 0x10, 0x24,
0x89, 0xd2, 0x08, 0xc1, 0xb5, 0x6b, 0x4d, 0xa6,
0xec, 0x6c, 0x60, 0xe3, 0x46, 0x93, 0x29, 0x3f,
0x1f, 0x78, 0xf4, 0xc8, 0xe1, 0x68, 0x6e, 0x0e,
0x04, 0x3e, 0x7c, 0x18, 0x19, 0x19, 0x1e, 0x7e,
0xfa, 0x94, 0xcd, 0x8b, 0xdd, 0xbb, 0xe3, 0xc5,
0x11, 0x83, 0xc0, 0xc2, 0xf4, 0x1d, 0x3e, 0xbc,
0x79, 0xf3, 0xd9, 0xb3, 0xb3, 0x57, 0x70, 0x80,
0x73, 0x35, 0x7f, 0xee, 0x74, 0x8e, 0x8e, 0x5e,
0xbd, 0x1a, 0x79, 0x9e, 0x9d, 0x9d, 0x9c, 0xbc,
0x73, 0x27, 0x90, 0x98, 0xa8, 0x28, 0x69, 0x69,
0xc0, 0x9d, 0x3b, 0x4d, 0x4d, 0x75, 0x75, 0x8a,
0xe2, 0xf3, 0x7d, 0xfa, 0x34, 0x35, 0x55, 0x53,
0xd3, 0xdd, 0x5d, 0x5b, 0xab, 0x69, 0xd7, 0xaf,
0xb3, 0x41, 0xf7, 0xee, 0xdd, 0xdc, 0x0f, 0x88,
0x45, 0x13, 0x10, 0xff, 0x7d, 0x3e, 0x3e, 0xce,
0xbe, 0x3d, 0x2c, 0x96, 0xdf, 0x39, 0xa2, 0x54,
0x92, 0x80, 0x50, 0xe8, 0xcc, 0x99, 0xa3, 0x47,
0x2b, 0x2b, 0x13, 0x12, 0x24, 0x89, 0x52, 0x59,
0x06, 0xb6, 0x6e, 0x4d, 0x49, 0xd9, 0xbf, 0x1f,
0xf0, 0xfb, 0xbf, 0x7e, 0xfd, 0xf1, 0xc3, 0x30,
0x1a, 0x1a, 0x5a, 0x5a, 0x6e, 0xdc, 0x08, 0x04,
0x3e, 0x7f, 0x7e, 0xf3, 0x46, 0x51, 0xce, 0x9d,
0x1b, 0x1c, 0x6c, 0x6d, 0xd5, 0x75, 0x97, 0x8b,
0x79, 0x49, 0x48, 0x58, 0xec, 0x4d, 0x88, 0x41,
0x80, 0x10, 0x36, 0x21, 0xb3, 0xb2, 0x98, 0x6d,
0x32, 0x31, 0x2d, 0xcb, 0xb1, 0x6c, 0x16, 0xb9,
0xae, 0x2e, 0xd6, 0xf9, 0x81, 0xbc, 0x3c, 0x8b,
0xa5, 0xa4, 0x04, 0xe8, 0xeb, 0xeb, 0xed, 0xed,
0xeb, 0x53, 0x55, 0x97, 0xab, 0xa3, 0xa3, 0xbd,
0x7d, 0x6a, 0x6a, 0x70, 0xd0, 0xe1, 0xd0, 0xb4,
0xb2, 0xb2, 0xf1, 0x71, 0xb7, 0xdb, 0x30, 0x86,
0x86, 0xd8, 0x7e, 0xde, 0x10, 0xb8, 0x66, 0x5d,
0xee, 0x0f, 0x08, 0xf0, 0xcd, 0x6c, 0x44, 0x2d,
0xb4, 0xb9, 0xd6, 0xb4, 0xb9, 0x1a, 0x08, 0x06,
0x43, 0xa1, 0x60, 0x10, 0x70, 0x3a, 0x5d, 0xae,
0xb6, 0x36, 0x45, 0xf1, 0x78, 0x3c, 0x9e, 0xfe,
0x7e, 0x8f, 0xa7, 0xb7, 0xb7, 0xbe, 0x5e, 0x55,
0x2b, 0x2b, 0x03, 0x81, 0xc9, 0x49, 0x60, 0x7a,
0x3a, 0xfa, 0xfe, 0x88, 0x9f, 0x3f, 0xcc, 0x00,
0x6b, 0x68, 0x91, 0x88, 0x84, 0xc3, 0x4c, 0xf3,
0xda, 0xe0, 0xf7, 0x93, 0xeb, 0x48, 0xb4, 0x1a,
0x1a, 0x9a, 0x9b, 0x6f, 0xde, 0x54, 0x14, 0xaf,
0xf7, 0xe3, 0x47, 0x9f, 0xaf, 0xb1, 0xf1, 0xf5,
0xeb, 0xba, 0x3a, 0x4d, 0xab, 0xae, 0x66, 0x53,
0x63, 0x3e, 0x71, 0x7e, 0x4e, 0x28, 0x34, 0xf7,
0x1c, 0xf6, 0x79, 0x6e, 0x18, 0x0b, 0x6b, 0x2f,
0x4e, 0x02, 0xfc, 0xa0, 0x60, 0xf0, 0xd7, 0x99,
0xe1, 0x40, 0x24, 0xc9, 0x30, 0x34, 0x0d, 0x78,
0xf9, 0x72, 0x78, 0xd8, 0xed, 0xf6, 0xf9, 0x6e,
0xdf, 0x76, 0xbb, 0xed, 0x76, 0x4d, 0x6b, 0x6b,
0x8b, 0x4e, 0x34, 0x16, 0x11, 0x4e, 0xc0, 0xe7,
0xab, 0xae, 0xb6, 0xdb, 0xab, 0xaa, 0xd2, 0xd2,
0x16, 0x62, 0x63, 0x7f, 0x68, 0xfe, 0xb3, 0x16,
0x97, 0x30, 0x49, 0x62, 0x9a, 0x17, 0x1b, 0xb7,
0x79, 0xd1, 0xf3, 0x8c, 0xf1, 0x4c, 0xc5, 0x1a,
0x46, 0xb1, 0xae, 0x22, 0x27, 0xc0, 0x03, 0xc7,
0x33, 0xc3, 0xd7, 0x45, 0xa1, 0xb3, 0x38, 0x02,
0xf3, 0x85, 0x03, 0x9c, 0x0f, 0x7c, 0x61, 0x51,
0xfe, 0x1a, 0xf8, 0xd2, 0x6b, 0xe0, 0x7f, 0x2f,
0xff, 0x00, 0xfd, 0x31, 0x98, 0x2a, 0xe9, 0xf5,
0x13, 0xc9, 0x00, 0x00, 0x00, 0x22, 0x7a, 0x54,
0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61,
0x72, 0x65, 0x00, 0x00, 0x78, 0xda, 0x2b, 0x2f,
0x2f, 0xd7, 0xcb, 0xcc, 0xcb, 0x2e, 0x4e, 0x4e,
0x2c, 0x48, 0xd5, 0xcb, 0x2f, 0x4a, 0x07, 0x00,
0x36, 0xd8, 0x06, 0x58, 0x10, 0x53, 0xca, 0x5c,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xae, 0x42, 0x60, 0x82};

274
art/tango/go_next.h Normal file
View File

@@ -0,0 +1,274 @@
/* go_next.png - 676 bytes */
static const unsigned char go_next_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
0x02, 0x36, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
0x95, 0x92, 0x4b, 0x48, 0x54, 0x61, 0x1c, 0xc5,
0x7f, 0xdf, 0xe3, 0xce, 0xc3, 0x46, 0xc3, 0x14,
0x52, 0xc4, 0x5e, 0x44, 0x20, 0x68, 0x14, 0x04,
0x85, 0xd3, 0x46, 0x68, 0xd1, 0x22, 0x82, 0x04,
0x5b, 0x46, 0x81, 0x42, 0xb8, 0xc9, 0x72, 0x8c,
0x36, 0x42, 0x2b, 0x37, 0x8d, 0x90, 0x8b, 0x28,
0x72, 0x13, 0x14, 0xbd, 0xa4, 0x45, 0x62, 0x3e,
0x70, 0x11, 0x2d, 0x66, 0xd0, 0x29, 0xa4, 0x14,
0x37, 0xd1, 0x22, 0x2c, 0x33, 0x9d, 0xb1, 0x81,
0x1e, 0xe3, 0x78, 0xef, 0xdc, 0xfb, 0xb5, 0x08,
0x5f, 0x33, 0x13, 0xd4, 0x81, 0xb3, 0xf9, 0xfe,
0x87, 0xc3, 0xf9, 0x9f, 0xff, 0x87, 0x31, 0x86,
0x7c, 0x86, 0xbb, 0x74, 0xac, 0xb1, 0x53, 0xb7,
0x15, 0x9b, 0xe5, 0x53, 0x52, 0x04, 0xc6, 0xa3,
0x71, 0x77, 0xf5, 0x81, 0xbe, 0x70, 0x97, 0x35,
0x10, 0x8e, 0x58, 0xa1, 0x62, 0x9a, 0x35, 0x14,
0x35, 0x00, 0xb8, 0xd2, 0xd2, 0x1b, 0x3c, 0x79,
0xf4, 0xec, 0x69, 0x04, 0xb3, 0xe1, 0x88, 0xd5,
0xf0, 0xdf, 0x06, 0x4a, 0x6a, 0x9a, 0x0e, 0x9f,
0xf1, 0xb5, 0x37, 0x5f, 0xaf, 0x0d, 0xfa, 0x43,
0x13, 0xe1, 0x88, 0xd5, 0x56, 0x4c, 0x27, 0x1a,
0x23, 0xfa, 0x2b, 0x86, 0x9d, 0x5b, 0x1e, 0x15,
0xd9, 0x9b, 0xed, 0x83, 0x81, 0xa9, 0xcf, 0x63,
0x54, 0x95, 0xed, 0xc3, 0x27, 0xb7, 0xf1, 0x78,
0xfc, 0xd6, 0xca, 0x87, 0xf9, 0x99, 0x61, 0x63,
0x38, 0x1f, 0x8b, 0x3a, 0x3f, 0x37, 0x0c, 0x3a,
0xb5, 0xe9, 0xb9, 0x78, 0x1f, 0x29, 0x14, 0x4a,
0x28, 0x84, 0x90, 0x08, 0x04, 0x00, 0x89, 0x4f,
0x43, 0x78, 0xb8, 0x94, 0xf9, 0x77, 0xb0, 0xab,
0xbc, 0x9e, 0xf8, 0xf4, 0xb8, 0x33, 0x36, 0x39,
0xb0, 0x80, 0x31, 0xa7, 0x62, 0x51, 0x67, 0x06,
0x40, 0x03, 0xb8, 0x5e, 0x8e, 0xd8, 0xc7, 0x67,
0x28, 0xa9, 0x51, 0x42, 0x81, 0x10, 0x08, 0x01,
0x42, 0x01, 0xc2, 0x63, 0xd9, 0x9e, 0x23, 0xbd,
0x34, 0xcf, 0xc1, 0xba, 0x23, 0x56, 0x4d, 0xd5,
0x9e, 0xda, 0xa7, 0x63, 0x77, 0x27, 0xc2, 0x11,
0xab, 0x23, 0x16, 0x75, 0xfa, 0x35, 0x40, 0xce,
0x5b, 0x25, 0x9d, 0x59, 0xc0, 0x76, 0xb3, 0xd8,
0x6e, 0x16, 0xa5, 0x34, 0xa5, 0x25, 0x65, 0x94,
0x04, 0x42, 0xf8, 0x2d, 0x3f, 0x46, 0xb8, 0xd8,
0x5e, 0x8e, 0x77, 0x4b, 0xa3, 0xd4, 0x84, 0xea,
0x44, 0x6b, 0x73, 0x57, 0xc9, 0xd0, 0xab, 0x47,
0x7d, 0xc7, 0xaf, 0x5a, 0xc7, 0x34, 0xc0, 0xd2,
0x8f, 0x39, 0xde, 0x27, 0x5f, 0xaf, 0x77, 0xa0,
0x7d, 0x82, 0x94, 0x23, 0xd1, 0x59, 0x89, 0xd6,
0x0a, 0xbf, 0x2f, 0x88, 0x4f, 0x06, 0x50, 0xf8,
0x29, 0xcd, 0x95, 0xa3, 0x4c, 0x90, 0xac, 0x9d,
0x31, 0xeb, 0x2b, 0x6c, 0x29, 0x50, 0x82, 0xd4,
0x02, 0x65, 0xc9, 0x3f, 0xf4, 0x81, 0xa7, 0xb2,
0xa0, 0x2c, 0x1a, 0x2a, 0x9a, 0x48, 0x2f, 0x66,
0xcc, 0x83, 0x97, 0x77, 0x56, 0xb2, 0xab, 0x99,
0x8d, 0x15, 0x00, 0x5a, 0x0e, 0x5d, 0x5b, 0x37,
0x50, 0x96, 0x40, 0x69, 0xc9, 0xc8, 0x5c, 0x2f,
0xda, 0x27, 0xa9, 0x0e, 0xed, 0xa7, 0x6e, 0xfb,
0x09, 0x26, 0xdf, 0xc4, 0xed, 0xc4, 0xdb, 0xf8,
0x57, 0xe3, 0xb2, 0xa9, 0x44, 0xc1, 0xe2, 0xed,
0x27, 0x3d, 0x5b, 0xce, 0x28, 0x2d, 0xb2, 0x97,
0xce, 0x75, 0x07, 0x94, 0x52, 0xd4, 0x57, 0x36,
0x51, 0xa1, 0xf7, 0x32, 0xf0, 0xfc, 0x61, 0x66,
0x31, 0xf9, 0x65, 0xc4, 0xb8, 0x79, 0x67, 0x34,
0xc6, 0x14, 0x7c, 0x8e, 0x70, 0xc4, 0x32, 0x97,
0x5b, 0xbb, 0xf9, 0xe5, 0x25, 0x49, 0xa6, 0x52,
0xe6, 0xc5, 0xe8, 0xe0, 0x8a, 0xed, 0xd8, 0x1d,
0xb1, 0x1b, 0x4e, 0x7f, 0xbe, 0xb6, 0xa0, 0x83,
0x35, 0x38, 0x39, 0x9b, 0xc4, 0x54, 0x62, 0x75,
0x7a, 0x76, 0x6a, 0xd1, 0xdb, 0x14, 0xb9, 0xa0,
0xb3, 0xbf, 0x25, 0xa8, 0x28, 0xaf, 0xcc, 0x7c,
0xfb, 0x9e, 0x1a, 0x36, 0x2e, 0x17, 0x36, 0x47,
0xfe, 0xa7, 0x04, 0x42, 0x12, 0x5f, 0x4e, 0xa7,
0xee, 0xc5, 0xa2, 0x85, 0x91, 0xf3, 0xf1, 0x1b,
0x41, 0xde, 0x09, 0xb4, 0x6e, 0x76, 0xe5, 0xb6,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xae, 0x42, 0x60, 0x82};
/* go_next.png - 1456 bytes */
static const unsigned char go_next_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
0x0d, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x5d, 0x48, 0x53, 0x6d, 0x1c, 0xff, 0x9d,
0x9d, 0xb3, 0xb9, 0x2d, 0xf3, 0xa3, 0x90, 0x09,
0x49, 0x76, 0xd5, 0x97, 0x5e, 0x24, 0x18, 0x99,
0xf3, 0xc2, 0xa0, 0x8c, 0xae, 0x2a, 0x4a, 0xaa,
0x9b, 0x08, 0x0b, 0x91, 0xae, 0x14, 0x99, 0x08,
0x41, 0x50, 0x90, 0x44, 0x94, 0x17, 0xde, 0x04,
0x95, 0x88, 0xcb, 0x8b, 0x61, 0x25, 0x82, 0x12,
0x29, 0x96, 0x49, 0x93, 0x65, 0x51, 0x2a, 0x95,
0xf8, 0xd1, 0x87, 0xd5, 0x74, 0xd9, 0x9a, 0x34,
0xe7, 0xb6, 0xb3, 0xb3, 0xf3, 0x3c, 0xa7, 0x8b,
0xa7, 0xe7, 0x9d, 0x8e, 0x77, 0xac, 0xf7, 0xd5,
0x2e, 0xde, 0x97, 0xfe, 0x30, 0x7e, 0xfc, 0x9f,
0x3d, 0xcf, 0x7f, 0xbf, 0xdf, 0xff, 0xe3, 0x39,
0x67, 0xc0, 0x1f, 0xfb, 0x63, 0x2b, 0x32, 0x71,
0xb5, 0x03, 0x5a, 0xad, 0x36, 0x9b, 0x24, 0xf5,
0xf7, 0xe7, 0xe4, 0x14, 0x15, 0x09, 0x82, 0xcf,
0xe7, 0x76, 0xbb, 0x5c, 0x9a, 0x36, 0x39, 0xf9,
0xbb, 0x04, 0xe8, 0x56, 0x3b, 0xa0, 0xa6, 0x51,
0x0a, 0x94, 0x96, 0xe6, 0xe6, 0x5a, 0x2c, 0x9b,
0x37, 0xdf, 0xb9, 0x63, 0xb5, 0xda, 0x6c, 0x7a,
0x7d, 0x4d, 0xcd, 0x7f, 0x46, 0x00, 0xb7, 0xca,
0xca, 0x43, 0x87, 0xce, 0x9d, 0x33, 0x1a, 0xf3,
0xf2, 0x36, 0x6d, 0x2a, 0x2c, 0xbc, 0x74, 0xa9,
0xa4, 0xa4, 0xae, 0x4e, 0x14, 0x6f, 0xdc, 0x28,
0x2f, 0x2f, 0x2f, 0x07, 0xc4, 0x55, 0xab, 0xfc,
0x6f, 0x13, 0x20, 0x8a, 0xa2, 0xa8, 0xd7, 0x03,
0x87, 0x0f, 0x97, 0x96, 0x56, 0x54, 0x98, 0x4c,
0x45, 0x45, 0x79, 0x79, 0xfb, 0xf7, 0x9f, 0x3c,
0x39, 0x3b, 0x9b, 0x9b, 0x2b, 0x49, 0x7d, 0x7d,
0xa5, 0xa5, 0x67, 0xcf, 0x02, 0xa9, 0xa9, 0x2b,
0xfd, 0x1d, 0x29, 0xd9, 0x86, 0xe2, 0x62, 0x9b,
0x4d, 0x92, 0xbe, 0x7c, 0x01, 0x28, 0x05, 0x2c,
0x96, 0xa4, 0x19, 0xd1, 0x49, 0x92, 0x20, 0xc8,
0x32, 0xa5, 0x94, 0xaa, 0xaa, 0xd1, 0x38, 0x32,
0x32, 0x3b, 0xdb, 0xd7, 0x07, 0x94, 0x94, 0x14,
0x14, 0x94, 0x95, 0xa5, 0xa4, 0xa4, 0xa7, 0xa7,
0xa6, 0x66, 0x66, 0x5a, 0xad, 0x0f, 0x1e, 0xb8,
0x5c, 0x0e, 0xc7, 0xf0, 0xf0, 0xae, 0x5d, 0x75,
0x75, 0x84, 0xec, 0xd9, 0x33, 0x34, 0x74, 0xe5,
0x0a, 0xe0, 0x76, 0xff, 0x53, 0x01, 0x42, 0x72,
0x01, 0xb5, 0xb5, 0x92, 0xa4, 0x69, 0x0d, 0x0d,
0x55, 0x55, 0x76, 0x7b, 0xe2, 0x7d, 0x9a, 0xc6,
0xba, 0x5f, 0xd3, 0xd8, 0x87, 0x52, 0xe6, 0xf7,
0xf7, 0x4f, 0x4d, 0xb5, 0xb5, 0x01, 0x82, 0x00,
0xe8, 0x74, 0xc0, 0xf6, 0xed, 0xd9, 0xd9, 0x56,
0x2b, 0xe0, 0xf1, 0x78, 0xbd, 0x33, 0x33, 0x94,
0x76, 0x76, 0xf6, 0xf7, 0xdb, 0xed, 0xdf, 0xbf,
0xab, 0xaa, 0xaa, 0xaa, 0xea, 0xde, 0xbd, 0x2e,
0x57, 0x63, 0x63, 0x34, 0x3a, 0x3c, 0xbc, 0xea,
0x02, 0x2e, 0x5e, 0xac, 0xac, 0xbc, 0x75, 0x0b,
0x78, 0xf2, 0xe4, 0xdd, 0xbb, 0xf6, 0xf6, 0xe5,
0xc4, 0x63, 0xa4, 0x01, 0x42, 0x28, 0x25, 0x24,
0x26, 0x80, 0x52, 0x4d, 0x53, 0x55, 0xb6, 0xce,
0x90, 0xf9, 0x5b, 0xb7, 0x5a, 0x2c, 0xbb, 0x77,
0x03, 0x9a, 0xa6, 0x28, 0x3a, 0x1d, 0xd0, 0xd1,
0xf1, 0xf0, 0x61, 0x4b, 0x4b, 0x30, 0x18, 0x0e,
0xcb, 0x72, 0x20, 0x70, 0xe2, 0x84, 0xd3, 0x79,
0xf5, 0x2a, 0x21, 0x5d, 0x5d, 0x49, 0x2b, 0xfe,
0xab, 0x4a, 0x39, 0x81, 0x48, 0x44, 0x55, 0xc3,
0xe1, 0x18, 0x2a, 0x0a, 0x21, 0xb2, 0xcc, 0x7c,
0x59, 0x06, 0xa2, 0x51, 0x42, 0x22, 0x11, 0x86,
0xb2, 0x0c, 0x28, 0x0a, 0x5b, 0xe7, 0xfb, 0x14,
0x85, 0x9d, 0x7b, 0xf9, 0xf2, 0xf3, 0xe7, 0x9e,
0x1e, 0x60, 0x61, 0x81, 0x10, 0x8f, 0x07, 0x38,
0x7e, 0xfc, 0xc0, 0x81, 0xaa, 0xaa, 0x35, 0x6b,
0xd2, 0xd3, 0xd7, 0xae, 0xcd, 0xca, 0x72, 0x38,
0x58, 0xe2, 0x6a, 0x6b, 0x57, 0x4d, 0x80, 0xaa,
0x52, 0x1a, 0x8d, 0x02, 0xe1, 0x70, 0x34, 0x1a,
0x08, 0x00, 0xf3, 0xf3, 0xa1, 0x90, 0xc7, 0x03,
0xcc, 0xcd, 0x05, 0x02, 0xd3, 0xd3, 0x80, 0xd7,
0xbb, 0xb8, 0xf8, 0xe9, 0x13, 0xe0, 0xf7, 0x87,
0xc3, 0x5f, 0xbf, 0x02, 0xb2, 0xac, 0xaa, 0x81,
0x00, 0x10, 0x8d, 0x02, 0xb2, 0x0c, 0x10, 0x22,
0x08, 0x91, 0x08, 0x40, 0xa9, 0x20, 0x28, 0x4a,
0x0c, 0xc7, 0xc6, 0xe6, 0xe6, 0x9c, 0x4e, 0x60,
0x6a, 0xca, 0xe7, 0x1b, 0x1a, 0x02, 0x8e, 0x1e,
0xdd, 0xb7, 0xef, 0xd4, 0x29, 0xb3, 0x39, 0x27,
0xc7, 0x62, 0xd9, 0xb8, 0xf1, 0xc2, 0x05, 0xab,
0xd5, 0x66, 0x13, 0xc5, 0xa6, 0xa6, 0x44, 0xbc,
0x92, 0x0e, 0x31, 0xb7, 0x40, 0x40, 0x96, 0xe7,
0xe7, 0x81, 0xe9, 0x69, 0x9f, 0xef, 0xd5, 0xab,
0x58, 0xaf, 0xff, 0xd5, 0x8b, 0x82, 0x4e, 0x07,
0x00, 0xa2, 0xa8, 0xd7, 0xeb, 0x74, 0x80, 0x28,
0x52, 0x2a, 0x08, 0xcc, 0x17, 0x45, 0xc0, 0x60,
0x90, 0x24, 0x83, 0x81, 0x0d, 0xb9, 0x28, 0x02,
0x82, 0xc0, 0xbe, 0xa7, 0x54, 0x10, 0x08, 0x01,
0x34, 0x4d, 0x92, 0xb8, 0x40, 0xe6, 0x0b, 0x02,
0x9b, 0x1c, 0x41, 0x10, 0x84, 0x0d, 0x1b, 0x56,
0x2c, 0x20, 0x1a, 0xa5, 0x34, 0x12, 0x49, 0x4c,
0x5c, 0xaf, 0x4f, 0x49, 0xd1, 0xe9, 0x00, 0x49,
0x32, 0x18, 0x96, 0x22, 0xbb, 0x95, 0x00, 0x9d,
0x4e, 0x14, 0x55, 0x95, 0x57, 0x13, 0xa0, 0x94,
0x52, 0x4d, 0x03, 0xb6, 0x6c, 0xc9, 0xc8, 0x28,
0x2e, 0x06, 0xb2, 0xb3, 0x0d, 0x86, 0x6d, 0xdb,
0x80, 0x7b, 0xf7, 0x7a, 0x7a, 0x5a, 0x5b, 0x43,
0x21, 0xbf, 0x7f, 0x71, 0xd1, 0xe7, 0x6b, 0x6e,
0x1e, 0x1c, 0x34, 0x9b, 0x09, 0xa9, 0xae, 0x5e,
0xb1, 0x80, 0x44, 0x16, 0xcb, 0x38, 0x43, 0x49,
0x62, 0x42, 0xe2, 0x05, 0xc5, 0x84, 0x30, 0xc9,
0xf9, 0xf9, 0x99, 0x99, 0x65, 0x65, 0x80, 0x28,
0x86, 0x42, 0x69, 0x69, 0x80, 0xc3, 0xd1, 0xd5,
0xd5, 0xd2, 0x12, 0x0a, 0x2d, 0x2e, 0xfa, 0xfd,
0xc1, 0x60, 0x7d, 0xfd, 0xd3, 0xa7, 0x4d, 0x4d,
0x84, 0xdc, 0xbc, 0x99, 0xec, 0xf7, 0x93, 0x08,
0xd0, 0xeb, 0xe3, 0x57, 0xca, 0xcb, 0x0b, 0x0a,
0xea, 0xeb, 0x59, 0x71, 0x81, 0x18, 0xb1, 0x98,
0x10, 0xee, 0x33, 0xec, 0xed, 0xf5, 0x78, 0x1a,
0x1b, 0x01, 0xb3, 0xd9, 0x64, 0x32, 0x99, 0x80,
0x1d, 0x3b, 0xd6, 0xaf, 0x3f, 0x78, 0x10, 0xf0,
0x7a, 0xdd, 0x6e, 0xbf, 0x5f, 0xd3, 0x3a, 0x3b,
0xbb, 0xbb, 0xed, 0xf6, 0x60, 0x70, 0x7e, 0xfe,
0xc3, 0x87, 0x48, 0xe4, 0xf4, 0xe9, 0xd7, 0xaf,
0xdb, 0xdb, 0x29, 0x1d, 0x18, 0x60, 0xd1, 0xcd,
0xe6, 0x9f, 0x34, 0x7f, 0xf2, 0x8c, 0x44, 0x78,
0x3f, 0x24, 0x11, 0xc0, 0x0f, 0x18, 0x0c, 0xac,
0x5d, 0xbc, 0xde, 0xeb, 0xd7, 0x1d, 0x8e, 0x86,
0x86, 0xac, 0xac, 0xe4, 0x15, 0x91, 0x24, 0x41,
0x50, 0x94, 0x9a, 0x9a, 0x33, 0x67, 0xce, 0x9f,
0x37, 0x18, 0x8c, 0x46, 0x51, 0x4c, 0x4b, 0x03,
0x0a, 0x0b, 0xd7, 0xad, 0x3b, 0x72, 0x04, 0x18,
0x1f, 0x7f, 0xf3, 0x66, 0x7c, 0x9c, 0x90, 0xbe,
0xbe, 0xc7, 0x8f, 0x7b, 0x7b, 0x7d, 0xbe, 0xe9,
0xe9, 0xc1, 0x41, 0x4d, 0xab, 0xa8, 0x98, 0x99,
0x71, 0xb9, 0x28, 0x9d, 0x9a, 0x62, 0x51, 0x4c,
0x26, 0x9e, 0x9e, 0xe5, 0xd1, 0x79, 0xf3, 0x12,
0xc2, 0x90, 0x52, 0x29, 0x11, 0x0d, 0x8e, 0x2e,
0xd7, 0xb5, 0x6b, 0xaa, 0x9a, 0x9f, 0xcf, 0xfc,
0x94, 0x94, 0xe5, 0x68, 0x34, 0xc6, 0xaf, 0xb3,
0xeb, 0x6f, 0x70, 0x90, 0x52, 0x42, 0x34, 0x0d,
0xd8, 0xb9, 0x33, 0x23, 0xe3, 0xd8, 0x31, 0xc0,
0xe9, 0x1c, 0x18, 0x70, 0x3a, 0x15, 0xe5, 0xc5,
0x8b, 0xd1, 0xd1, 0x67, 0xcf, 0xde, 0xbf, 0x1f,
0x1b, 0xbb, 0x7b, 0x57, 0x55, 0xab, 0xab, 0x17,
0x16, 0xdc, 0x6e, 0xe0, 0xdb, 0x37, 0x9e, 0x30,
0x4e, 0x6c, 0x39, 0x51, 0x8e, 0x7c, 0x8a, 0x78,
0x82, 0x15, 0x65, 0xc5, 0x33, 0x90, 0xc8, 0x64,
0x39, 0x1c, 0x96, 0x65, 0xe0, 0xfe, 0xfd, 0x47,
0x8f, 0xba, 0xba, 0x14, 0x65, 0x62, 0x62, 0x62,
0x62, 0x62, 0xc2, 0xe9, 0x1c, 0x19, 0x69, 0x6d,
0xa5, 0xf4, 0xf2, 0x65, 0xf6, 0xb4, 0x08, 0x06,
0xff, 0x5d, 0x74, 0x2e, 0x30, 0x61, 0x0b, 0x25,
0x52, 0x1e, 0xab, 0x0c, 0xcf, 0x00, 0x43, 0x3e,
0x11, 0xb1, 0xfb, 0xa9, 0xbd, 0xbd, 0xbb, 0xbb,
0xad, 0x4d, 0x51, 0x3e, 0x7e, 0x9c, 0x9c, 0x9c,
0x99, 0x69, 0x6e, 0x1e, 0x1d, 0xbd, 0x7d, 0x9b,
0xd2, 0xb6, 0xb6, 0xe5, 0x71, 0x79, 0x2f, 0x73,
0xe4, 0xf1, 0x96, 0xde, 0x57, 0x7f, 0x87, 0xfc,
0x7c, 0x42, 0x01, 0x7c, 0x23, 0x37, 0x21, 0xee,
0x95, 0x23, 0xbe, 0xc4, 0xb1, 0xd2, 0x12, 0x12,
0x8d, 0x6a, 0xda, 0xf3, 0xe7, 0x6f, 0xdf, 0x0e,
0x0f, 0xbb, 0xdd, 0x76, 0xfb, 0xd8, 0x58, 0x47,
0x47, 0x6c, 0x28, 0xb9, 0x40, 0x7e, 0x3e, 0x9e,
0x58, 0xbc, 0x10, 0xee, 0x87, 0xc3, 0xbc, 0xae,
0xf1, 0x89, 0x4a, 0xfa, 0x2e, 0xb4, 0x5c, 0x00,
0xbf, 0x95, 0x78, 0xcf, 0x73, 0x9f, 0xf7, 0x64,
0x7c, 0x85, 0xf8, 0xb9, 0xf8, 0x0a, 0xc5, 0x0f,
0x63, 0x7c, 0x22, 0xf8, 0x6d, 0xc3, 0x31, 0x3e,
0xa1, 0x4b, 0x98, 0xfd, 0x9a, 0x80, 0x44, 0xc6,
0x89, 0xf2, 0xdb, 0x22, 0x5e, 0x40, 0xfc, 0x1f,
0x17, 0x9e, 0xf9, 0x44, 0x43, 0xca, 0x71, 0xe9,
0xa3, 0xf2, 0x7f, 0x6e, 0x3f, 0x00, 0x80, 0x18,
0xdc, 0x3e, 0x3f, 0x2f, 0xea, 0x05, 0x00, 0x00,
0x00, 0x22, 0x7a, 0x54, 0x58, 0x74, 0x53, 0x6f,
0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x00,
0x78, 0xda, 0x2b, 0x2f, 0x2f, 0xd7, 0xcb, 0xcc,
0xcb, 0x2e, 0x4e, 0x4e, 0x2c, 0x48, 0xd5, 0xcb,
0x2f, 0x4a, 0x07, 0x00, 0x36, 0xd8, 0x06, 0x58,
0x10, 0x53, 0xca, 0x5c, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};

280
art/tango/go_previous.h Normal file
View File

@@ -0,0 +1,280 @@
/* go_previous.png - 655 bytes */
static const unsigned char go_previous_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
0x02, 0x21, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
0x85, 0x93, 0x4f, 0x48, 0x14, 0x71, 0x14, 0xc7,
0xbf, 0x6f, 0x66, 0x7e, 0xb3, 0x3b, 0xbb, 0x52,
0x62, 0x6c, 0xad, 0x1b, 0xb5, 0x42, 0x08, 0x11,
0x09, 0x82, 0x95, 0x6e, 0x5b, 0x87, 0xdc, 0x22,
0x56, 0xd3, 0x4c, 0x44, 0x22, 0x88, 0x0e, 0x25,
0x74, 0xb2, 0xa2, 0x2d, 0xba, 0x7a, 0x89, 0x10,
0x03, 0x3b, 0xc4, 0x1e, 0x24, 0xf0, 0xd0, 0x25,
0x0a, 0x82, 0xb0, 0x6e, 0x1d, 0x24, 0x57, 0x8a,
0x8e, 0x15, 0x1e, 0x22, 0x4b, 0xf7, 0x50, 0xb9,
0x6c, 0x92, 0xbb, 0xed, 0xcc, 0xee, 0xcc, 0xef,
0xf7, 0xeb, 0x30, 0x99, 0xae, 0x8c, 0xee, 0x83,
0x77, 0x7a, 0x7f, 0xf8, 0xbc, 0xef, 0x7b, 0x0f,
0x52, 0x4a, 0xd4, 0xf2, 0xa3, 0x37, 0xb5, 0x2b,
0xf1, 0x5b, 0x5a, 0xc6, 0x2b, 0xa6, 0x61, 0x0b,
0x8b, 0xa7, 0x58, 0x1d, 0x11, 0x26, 0xa3, 0xe1,
0xe6, 0xae, 0x85, 0x1f, 0x9f, 0x0d, 0xaf, 0x1c,
0x65, 0x8b, 0xe2, 0x16, 0x10, 0x3e, 0x9d, 0x3c,
0xdc, 0xdf, 0x73, 0x6d, 0xe0, 0x9e, 0x67, 0x31,
0x00, 0x6f, 0x82, 0x78, 0x8a, 0x0d, 0x19, 0xbe,
0xba, 0xf1, 0x8b, 0xc9, 0x61, 0x63, 0xcf, 0xce,
0x66, 0x52, 0x68, 0x73, 0xd0, 0xaa, 0xc8, 0x2a,
0xf2, 0xbe, 0xc8, 0x81, 0xae, 0xc1, 0x53, 0x57,
0x0d, 0x93, 0xaf, 0xe0, 0xe3, 0xf7, 0x69, 0x1c,
0x89, 0xf6, 0x80, 0x54, 0x58, 0xf1, 0x14, 0x93,
0x55, 0xd5, 0x84, 0x9f, 0x24, 0xa5, 0x5c, 0x87,
0x4c, 0x53, 0x89, 0x43, 0x7d, 0x8d, 0x1d, 0x07,
0x3b, 0xd9, 0xd7, 0x5f, 0x1f, 0x50, 0xb0, 0xf2,
0xd0, 0x54, 0x86, 0x58, 0x53, 0x1f, 0x88, 0x14,
0x10, 0x00, 0x09, 0x40, 0x4a, 0x01, 0x21, 0x05,
0xee, 0xa4, 0x2f, 0xb8, 0x04, 0xf1, 0x14, 0x1b,
0x0a, 0x1a, 0xdb, 0x1f, 0xf4, 0x9f, 0xb8, 0xe4,
0xaf, 0xaf, 0x6f, 0xa0, 0xf7, 0x8b, 0xaf, 0xc0,
0xa5, 0x03, 0xa6, 0xe8, 0x10, 0x92, 0x63, 0x66,
0xfe, 0x19, 0x88, 0x08, 0x04, 0x82, 0x84, 0xab,
0x7e, 0x7b, 0xb4, 0xd7, 0x1d, 0xe1, 0xd8, 0x6d,
0xf6, 0xa8, 0xa9, 0x71, 0xff, 0xf9, 0xee, 0xe3,
0x83, 0x46, 0xae, 0xb4, 0x80, 0x77, 0xdf, 0xde,
0x80, 0x31, 0x1f, 0x74, 0x4d, 0x07, 0x57, 0x04,
0x2c, 0x51, 0x80, 0x69, 0x16, 0x50, 0xb4, 0x56,
0x50, 0xb6, 0x4b, 0x50, 0x48, 0x85, 0x9f, 0x05,
0xd1, 0xba, 0x3b, 0xb1, 0xa6, 0x01, 0xe7, 0x36,
0x2c, 0xfb, 0x0f, 0x4c, 0xe7, 0x37, 0x4a, 0x32,
0x0f, 0x70, 0x01, 0x87, 0x9b, 0xa8, 0x08, 0x13,
0x5c, 0x72, 0x48, 0x2e, 0xc1, 0x1d, 0x09, 0xc7,
0x16, 0xe0, 0x8e, 0x3b, 0x72, 0xae, 0x98, 0x75,
0xd7, 0x38, 0x33, 0x6a, 0x5f, 0xce, 0x2e, 0x7d,
0xb9, 0xfe, 0xf8, 0x65, 0xda, 0x84, 0xed, 0x93,
0xad, 0x7b, 0x13, 0x90, 0x7a, 0x19, 0x42, 0x2f,
0x81, 0x05, 0x00, 0x7f, 0x40, 0x85, 0x1e, 0x50,
0xc1, 0x0c, 0x05, 0xcc, 0xaf, 0x40, 0xd5, 0xa8,
0x5a, 0xc7, 0xf5, 0x22, 0x92, 0x82, 0xa9, 0xb6,
0x96, 0x58, 0xb8, 0xbd, 0x2d, 0xa6, 0xcf, 0x15,
0x5e, 0x23, 0x5f, 0x99, 0x87, 0x90, 0xc0, 0xe9,
0xc8, 0x0d, 0x88, 0x7f, 0x14, 0xdc, 0x76, 0x1d,
0x00, 0xd2, 0x4f, 0xee, 0xae, 0x35, 0xf8, 0xbf,
0x46, 0x15, 0x93, 0xbb, 0x76, 0x44, 0x92, 0xe7,
0xce, 0x0c, 0x04, 0x8a, 0x6c, 0x11, 0x73, 0xcb,
0xd3, 0xe8, 0x0c, 0x0d, 0xe3, 0xfe, 0xc4, 0x88,
0xc5, 0x2b, 0xf0, 0x6f, 0xba, 0xc6, 0x8d, 0x87,
0xc4, 0x74, 0x7d, 0xbc, 0xb7, 0xfb, 0xac, 0x11,
0x0e, 0x87, 0x28, 0xa8, 0x84, 0x30, 0xfa, 0x70,
0x04, 0x99, 0x31, 0x9b, 0x36, 0xe6, 0x7a, 0x9e,
0x72, 0x66, 0xcc, 0x9e, 0xb0, 0x2b, 0x95, 0x8e,
0xe7, 0x2f, 0x9e, 0x66, 0x67, 0x67, 0xdf, 0x96,
0xcb, 0xe5, 0x8a, 0x57, 0x5a, 0xb5, 0x06, 0x5e,
0xb6, 0x3a, 0x52, 0xc3, 0xb6, 0x50, 0x32, 0xbf,
0x9c, 0x0b, 0x78, 0x11, 0xd4, 0x7c, 0xe5, 0x5a,
0xef, 0xfc, 0x17, 0x6d, 0xf3, 0x34, 0x74, 0xec,
0xca, 0xcb, 0x09, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
/* go_previous.png - 1532 bytes */
static const unsigned char go_previous_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x05,
0x59, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x5d, 0x48, 0x54, 0x4d, 0x18, 0x7e, 0xcf,
0xcc, 0x9c, 0xb3, 0xee, 0xba, 0x7e, 0x91, 0x3f,
0x81, 0xa6, 0xd1, 0x0a, 0x65, 0x44, 0x60, 0x41,
0x99, 0xee, 0xae, 0x17, 0x6a, 0x65, 0x84, 0x49,
0xf6, 0x2f, 0x92, 0x17, 0x11, 0xdd, 0x78, 0x95,
0xba, 0x5d, 0xd8, 0x45, 0x42, 0x74, 0x13, 0x41,
0x60, 0xd4, 0x45, 0x7a, 0x63, 0x45, 0xe5, 0x85,
0xb5, 0x45, 0x04, 0x26, 0x59, 0xd0, 0x0f, 0x18,
0xae, 0x76, 0x21, 0x44, 0x52, 0x84, 0xf9, 0xb3,
0xe1, 0xe2, 0xcf, 0xba, 0xec, 0xae, 0x67, 0x77,
0xce, 0xcc, 0x77, 0x31, 0x0c, 0xa7, 0xf6, 0xfb,
0xb6, 0xcf, 0x72, 0xbb, 0xf9, 0xe8, 0x85, 0xe5,
0x61, 0x76, 0x66, 0xce, 0x79, 0x9f, 0xf7, 0x7d,
0xde, 0x77, 0xe6, 0x00, 0xfc, 0xb1, 0x3f, 0xb6,
0x22, 0x53, 0x7e, 0xf7, 0x0b, 0xca, 0xca, 0x5a,
0x5a, 0x08, 0xa9, 0xae, 0x56, 0x14, 0x45, 0x01,
0x68, 0x6b, 0xd3, 0x34, 0xbb, 0x9d, 0xd2, 0xaa,
0xaa, 0x17, 0x2f, 0xda, 0xdb, 0x01, 0x28, 0x5d,
0xe9, 0xf3, 0xd1, 0xef, 0x72, 0xdc, 0xed, 0xf6,
0x78, 0x54, 0xb5, 0xa9, 0x69, 0xed, 0xda, 0x9c,
0x1c, 0x87, 0xe3, 0xfe, 0x7d, 0x84, 0x14, 0x05,
0xe3, 0xf2, 0x72, 0x31, 0x4b, 0x48, 0xaa, 0xde,
0x93, 0x42, 0x02, 0xed, 0xed, 0x00, 0x08, 0x39,
0x9d, 0xad, 0xad, 0x18, 0x5f, 0xbb, 0xb6, 0x71,
0x63, 0x41, 0x41, 0x71, 0xf1, 0xa5, 0x4b, 0xa7,
0x4f, 0xd7, 0xd6, 0xb6, 0xb5, 0xd9, 0x6c, 0x18,
0x23, 0x44, 0x08, 0x63, 0xa9, 0x0e, 0xd4, 0x8a,
0x23, 0xb1, 0x67, 0x4f, 0x6b, 0x2b, 0x40, 0x7a,
0x7a, 0x38, 0x1c, 0x0e, 0x13, 0xe2, 0xf5, 0x96,
0x94, 0x6c, 0xde, 0x5c, 0x51, 0xe1, 0x76, 0xef,
0xda, 0x55, 0x52, 0x72, 0xe8, 0x50, 0x5a, 0x9a,
0xaa, 0x12, 0xa2, 0x69, 0xa9, 0x76, 0x3b, 0x05,
0x04, 0x5c, 0xae, 0xb3, 0x67, 0x01, 0xf2, 0xf2,
0x22, 0x11, 0xc6, 0x08, 0x79, 0xfe, 0xbc, 0xaa,
0x6a, 0xc7, 0x8e, 0xba, 0x3a, 0x87, 0x63, 0xdb,
0xb6, 0xa2, 0xa2, 0xb2, 0x32, 0x55, 0x1d, 0x19,
0x99, 0x9a, 0x7a, 0xfa, 0x14, 0xa0, 0xb4, 0x74,
0xfd, 0xfa, 0xda, 0x5a, 0x00, 0x84, 0x08, 0x01,
0x88, 0xc5, 0x74, 0x3d, 0x14, 0x22, 0x24, 0x1a,
0x75, 0x3a, 0x5b, 0x5a, 0x7e, 0xf4, 0x7c, 0x45,
0x41, 0x08, 0x20, 0x10, 0x50, 0xd5, 0xf4, 0x74,
0x4a, 0xf3, 0xf2, 0x92, 0xd5, 0xcc, 0x4f, 0x13,
0x70, 0x3a, 0x3d, 0x1e, 0x55, 0xdd, 0xba, 0x55,
0x68, 0xba, 0xbf, 0xbf, 0xb6, 0xb6, 0xb2, 0xb2,
0xa1, 0x61, 0xf5, 0xea, 0xdc, 0xdc, 0x9c, 0x9c,
0xfc, 0x7c, 0x8c, 0x07, 0x07, 0xc7, 0xc7, 0x1f,
0x3f, 0x16, 0x6b, 0x39, 0x07, 0x30, 0x0c, 0xc6,
0x0c, 0x03, 0xe0, 0xdc, 0xb9, 0xc6, 0xc6, 0xeb,
0xd7, 0xad, 0x56, 0x84, 0x84, 0x6b, 0x8a, 0x22,
0x7f, 0x62, 0x9c, 0x68, 0xe7, 0xcf, 0x77, 0x76,
0x9e, 0x3a, 0x95, 0x99, 0x09, 0x00, 0x40, 0xa9,
0xac, 0x99, 0x15, 0x10, 0x28, 0x2b, 0x6b, 0x6e,
0xc6, 0xb8, 0xa6, 0xc6, 0x66, 0xd3, 0x34, 0x9b,
0xed, 0xee, 0xdd, 0x03, 0x07, 0x2a, 0x2a, 0x4e,
0x9c, 0xb0, 0xdb, 0x11, 0xb2, 0x58, 0x38, 0x07,
0x18, 0x1c, 0x1c, 0x1f, 0x7f, 0xf4, 0x08, 0x40,
0x10, 0x03, 0xc0, 0x18, 0x21, 0x55, 0x05, 0x78,
0xf6, 0x6c, 0x6c, 0xac, 0xbb, 0x5b, 0xfc, 0x4f,
0x88, 0x40, 0x84, 0xc4, 0x3c, 0xc6, 0x82, 0x84,
0x20, 0x24, 0xfa, 0x94, 0xdb, 0x5d, 0x58, 0x78,
0xe4, 0xc8, 0xf2, 0x03, 0xfa, 0x9f, 0x04, 0x9c,
0xce, 0xd6, 0x56, 0x42, 0x9a, 0x9b, 0x57, 0xad,
0xb2, 0xdb, 0x33, 0x33, 0x2f, 0x5c, 0xa8, 0xab,
0xab, 0xaa, 0x6a, 0x6c, 0xb4, 0xd9, 0x66, 0x67,
0xa3, 0xd1, 0xf1, 0x71, 0x80, 0x8f, 0x1f, 0x27,
0x26, 0x86, 0x87, 0x4d, 0x87, 0x09, 0x11, 0xc8,
0x18, 0xe7, 0x8c, 0x01, 0x30, 0x26, 0x32, 0x20,
0x8a, 0xd8, 0x24, 0x48, 0x29, 0x63, 0x08, 0x99,
0x84, 0xa4, 0x19, 0x06, 0x63, 0xf1, 0xb8, 0xc8,
0x1e, 0xe7, 0x82, 0xe0, 0x2f, 0x11, 0x70, 0xb9,
0x3c, 0x1e, 0x8c, 0x3b, 0x3a, 0x72, 0x73, 0xb3,
0xb2, 0xf2, 0xf3, 0x4f, 0x9e, 0xac, 0xae, 0x76,
0xbb, 0x0f, 0x1f, 0xb6, 0xd9, 0xc6, 0xc6, 0x66,
0x67, 0xdf, 0xbe, 0x05, 0x98, 0x9a, 0x5a, 0x58,
0xf8, 0xf0, 0xe1, 0xdf, 0x1c, 0xe6, 0xdc, 0x30,
0x00, 0x54, 0x55, 0x51, 0xc4, 0x18, 0xe3, 0x58,
0x0c, 0x20, 0x16, 0x53, 0x14, 0x4a, 0x01, 0x0c,
0x83, 0xf3, 0x78, 0x5c, 0x0a, 0x4c, 0x34, 0x54,
0x4d, 0x03, 0xb0, 0x58, 0x30, 0xce, 0xc8, 0x00,
0xa0, 0x54, 0xcc, 0x73, 0xce, 0xb9, 0x58, 0xf1,
0xcb, 0x19, 0x40, 0x08, 0x20, 0x2f, 0x4f, 0x26,
0x58, 0xe8, 0x19, 0x20, 0x1e, 0xa7, 0x74, 0x69,
0x09, 0x40, 0xd7, 0x29, 0x8d, 0x44, 0x00, 0xe2,
0x71, 0x11, 0x51, 0x19, 0x31, 0x8c, 0xcd, 0x9e,
0x43, 0xa9, 0xd8, 0xcd, 0x39, 0x00, 0x42, 0x18,
0x0b, 0xcd, 0x23, 0xf4, 0x6d, 0x54, 0x39, 0x67,
0x4c, 0xec, 0x5d, 0x5a, 0x02, 0x00, 0x88, 0x44,
0x18, 0x9b, 0x9f, 0x5f, 0xbe, 0x84, 0x92, 0x9e,
0x03, 0xaf, 0x5f, 0x5b, 0xad, 0x86, 0x71, 0xf4,
0xe8, 0xf4, 0xf4, 0xcc, 0xcc, 0xe4, 0x64, 0x57,
0xd7, 0x83, 0x07, 0x03, 0x03, 0xb7, 0x6f, 0x87,
0xc3, 0x1b, 0x36, 0x64, 0x65, 0x95, 0x94, 0x00,
0x14, 0x15, 0xad, 0x59, 0xb3, 0x73, 0xa7, 0x49,
0x84, 0x31, 0x84, 0x84, 0x0b, 0x22, 0xe2, 0x84,
0x58, 0x2c, 0x00, 0x00, 0x9a, 0x66, 0xb5, 0x62,
0x0c, 0x60, 0xb1, 0xd8, 0x6c, 0x18, 0x03, 0xa4,
0xa5, 0xa5, 0xa7, 0x8b, 0xb1, 0x44, 0xf1, 0xbf,
0xaa, 0x5a, 0xad, 0x08, 0x01, 0x30, 0xa6, 0x28,
0xb1, 0x58, 0x0a, 0x08, 0x88, 0x83, 0x89, 0xb1,
0x37, 0x6f, 0x2e, 0x5f, 0xa6, 0xb4, 0xb9, 0x79,
0x6e, 0x2e, 0x10, 0x98, 0x9f, 0xf7, 0x78, 0x7a,
0x7b, 0xfb, 0xfa, 0xba, 0xbb, 0x23, 0x91, 0xcc,
0x4c, 0x4d, 0x2b, 0x28, 0x00, 0x28, 0x2d, 0x75,
0x38, 0xf6, 0xef, 0x07, 0x50, 0x55, 0x55, 0x55,
0x55, 0x00, 0x8c, 0x55, 0x15, 0x21, 0x00, 0x42,
0x34, 0x0d, 0x21, 0x00, 0x55, 0xb5, 0x58, 0x10,
0xfa, 0x96, 0xc8, 0x3f, 0x1d, 0xc7, 0x58, 0x10,
0x16, 0x35, 0x21, 0x32, 0x25, 0xe5, 0x13, 0x0a,
0x4d, 0x4f, 0x8b, 0x3c, 0xfe, 0xb4, 0x84, 0x00,
0x00, 0x54, 0x55, 0xa0, 0xc5, 0x32, 0x38, 0x78,
0xf5, 0x2a, 0xa5, 0x3d, 0x3d, 0x5b, 0xb6, 0x1c,
0x3f, 0x1e, 0x89, 0xf8, 0xfd, 0x5e, 0xaf, 0x61,
0xdc, 0xb9, 0x73, 0xf3, 0xe6, 0xee, 0xdd, 0x4e,
0x67, 0x4d, 0x8d, 0xdd, 0x5e, 0x5e, 0xee, 0x70,
0x1c, 0x3b, 0xa6, 0x28, 0x3e, 0x5f, 0x20, 0xf0,
0xf0, 0x21, 0x00, 0xe7, 0x08, 0xc5, 0x62, 0x00,
0xfb, 0xf6, 0x15, 0x16, 0x9e, 0x39, 0x03, 0x40,
0x08, 0x21, 0x84, 0x98, 0x04, 0xa5, 0xc6, 0x19,
0xa3, 0x54, 0xc8, 0x53, 0xa0, 0x1c, 0xcb, 0xf2,
0xf5, 0xfb, 0x87, 0x87, 0x01, 0x6c, 0x36, 0xe1,
0x87, 0xa8, 0x1e, 0x13, 0x93, 0x12, 0x90, 0x7d,
0x57, 0xea, 0x59, 0xa2, 0xc5, 0x32, 0x3a, 0x7a,
0xef, 0x9e, 0x61, 0xbc, 0x7b, 0xb7, 0x6e, 0x9d,
0xdb, 0x0d, 0x70, 0xf0, 0x60, 0x5f, 0x1f, 0xa5,
0x5e, 0xef, 0xad, 0x5b, 0x2e, 0xd7, 0xf6, 0xed,
0x95, 0x95, 0xd9, 0xd9, 0x6e, 0xf7, 0xa6, 0x4d,
0x0d, 0x0d, 0x84, 0x0c, 0x0d, 0x05, 0x02, 0xbd,
0xbd, 0x42, 0xe3, 0x00, 0x00, 0x57, 0xae, 0x74,
0x75, 0x5d, 0xbc, 0xa8, 0xeb, 0xba, 0x1e, 0x89,
0xc4, 0xe3, 0x42, 0x5e, 0x3f, 0x32, 0xe1, 0xfe,
0xc2, 0x42, 0x30, 0x38, 0x31, 0x61, 0x66, 0x40,
0xfa, 0x61, 0x18, 0x02, 0x19, 0x4b, 0x42, 0x00,
0xe3, 0xef, 0x51, 0x12, 0x32, 0xf1, 0xcb, 0x97,
0x57, 0xaf, 0x0c, 0xe3, 0xeb, 0xd7, 0x60, 0xf0,
0xf3, 0x67, 0x80, 0xfa, 0x7a, 0xc3, 0xa0, 0x74,
0x60, 0xa0, 0xa3, 0x23, 0x18, 0x5c, 0x5c, 0x0c,
0x06, 0x8b, 0x8a, 0x5c, 0xae, 0xd2, 0xd2, 0xfa,
0x7a, 0x4d, 0xe3, 0xdc, 0x30, 0x14, 0x05, 0x20,
0x1e, 0xd7, 0x75, 0xce, 0x55, 0xd5, 0xe7, 0xeb,
0xec, 0xa4, 0x74, 0xef, 0x5e, 0x5d, 0x5f, 0x5c,
0x04, 0x08, 0x85, 0xc4, 0xf3, 0x74, 0xfd, 0x7b,
0x14, 0xd5, 0x64, 0x8e, 0x13, 0xfd, 0x92, 0x7e,
0xc4, 0x62, 0x2b, 0xbe, 0xcc, 0x05, 0x83, 0x53,
0x53, 0x00, 0xa1, 0x90, 0xcf, 0x77, 0xe3, 0x86,
0x61, 0x34, 0x35, 0xf9, 0x7c, 0x3e, 0xdf, 0xd0,
0xd0, 0xc0, 0xc0, 0x93, 0x27, 0xfd, 0xfd, 0x5e,
0xaf, 0xae, 0x47, 0xa3, 0x91, 0x88, 0x74, 0x27,
0x75, 0x66, 0x5e, 0x0a, 0xf1, 0x8f, 0x12, 0x68,
0xa6, 0x2e, 0x19, 0x9a, 0xeb, 0x19, 0x13, 0x5d,
0xde, 0xef, 0x1f, 0x1e, 0xe6, 0xfc, 0xe5, 0x4b,
0x84, 0xb2, 0xb3, 0x83, 0xc1, 0x58, 0x6c, 0x72,
0x72, 0x6e, 0xee, 0xd3, 0xa7, 0xe2, 0xe2, 0xa5,
0x25, 0x5d, 0x0f, 0x87, 0x09, 0xf1, 0xfb, 0x47,
0x46, 0x0c, 0xa3, 0xb3, 0x53, 0x34, 0xe3, 0x68,
0x54, 0xec, 0x97, 0x9a, 0x96, 0xfd, 0x27, 0x51,
0xeb, 0x89, 0xf3, 0x66, 0x9f, 0x4a, 0x42, 0x40,
0x32, 0x94, 0xbd, 0x20, 0xf1, 0x3c, 0x4c, 0x9c,
0x97, 0x9a, 0x94, 0x77, 0x15, 0x4a, 0x67, 0x66,
0x46, 0x47, 0x39, 0x1f, 0x19, 0x51, 0x94, 0xbf,
0xfe, 0x0a, 0x87, 0xdf, 0xbf, 0xd7, 0xb4, 0x8c,
0x0c, 0xce, 0x73, 0x73, 0xa7, 0xa7, 0x87, 0x86,
0x38, 0xef, 0xe9, 0x11, 0xe7, 0xad, 0x24, 0x90,
0x28, 0x21, 0x89, 0xd2, 0x51, 0xb9, 0x4e, 0xe6,
0xd2, 0x3c, 0xe2, 0x96, 0xf9, 0x45, 0x26, 0x09,
0x98, 0x5d, 0xe9, 0xfb, 0xb1, 0xd4, 0x64, 0x62,
0xed, 0xc8, 0x7d, 0x12, 0xe5, 0x8b, 0x13, 0x89,
0x27, 0x06, 0x20, 0x91, 0x48, 0xf2, 0x2f, 0xb7,
0x15, 0x7e, 0x52, 0x4a, 0x47, 0xa5, 0xa4, 0x12,
0x09, 0xe0, 0x84, 0x0c, 0xcb, 0xcc, 0x49, 0x4c,
0x24, 0x20, 0x71, 0x39, 0x97, 0x88, 0xff, 0x89,
0xfd, 0x0d, 0x55, 0x2f, 0x8f, 0xd6, 0x11, 0x55,
0x75, 0x12, 0x00, 0x00, 0x00, 0x22, 0x7a, 0x54,
0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61,
0x72, 0x65, 0x00, 0x00, 0x78, 0xda, 0x2b, 0x2f,
0x2f, 0xd7, 0xcb, 0xcc, 0xcb, 0x2e, 0x4e, 0x4e,
0x2c, 0x48, 0xd5, 0xcb, 0x2f, 0x4a, 0x07, 0x00,
0x36, 0xd8, 0x06, 0x58, 0x10, 0x53, 0xca, 0x5c,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xae, 0x42, 0x60, 0x82};

266
art/tango/go_up.h Normal file
View File

@@ -0,0 +1,266 @@
/* go_up.png - 652 bytes */
static const unsigned char go_up_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49,
0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58,
0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72,
0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e,
0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f,
0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00,
0x02, 0x1e, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d,
0x95, 0x93, 0x4f, 0x68, 0x13, 0x41, 0x14, 0xc6,
0xbf, 0x37, 0xbb, 0x33, 0xd9, 0x8d, 0x85, 0x7a,
0x68, 0x4c, 0xff, 0xd1, 0x82, 0x04, 0xed, 0xc1,
0x40, 0x2a, 0xa8, 0xd0, 0xd5, 0x8a, 0x68, 0x44,
0x62, 0x45, 0x2d, 0x14, 0x72, 0x6b, 0x4a, 0xc9,
0x49, 0x90, 0x62, 0x16, 0xc1, 0xab, 0xc7, 0x52,
0x91, 0xa0, 0x17, 0x0f, 0x45, 0x4f, 0x1e, 0xa5,
0x42, 0xf1, 0xe2, 0x4d, 0x2a, 0x5e, 0x44, 0x50,
0xd0, 0x43, 0x29, 0xb4, 0x2a, 0x95, 0x94, 0x34,
0x89, 0xa6, 0x9a, 0x26, 0xd9, 0xd9, 0x19, 0x0f,
0x51, 0xac, 0x21, 0xa9, 0xf6, 0x1d, 0xdf, 0xfb,
0xe6, 0xc7, 0x7c, 0xdf, 0x9b, 0x21, 0xad, 0x35,
0xda, 0xd5, 0xc9, 0x9b, 0x7c, 0x1e, 0x00, 0x96,
0x66, 0xbd, 0xe9, 0x76, 0x1a, 0xd6, 0x6e, 0xe0,
0xb8, 0x3c, 0xdd, 0xdf, 0x15, 0x49, 0xf6, 0x75,
0x1d, 0x4c, 0x3a, 0x2e, 0x4f, 0xef, 0x09, 0xe0,
0xb8, 0x3c, 0x1a, 0x10, 0xfb, 0xb2, 0x57, 0xce,
0x4c, 0x06, 0xc7, 0x46, 0x93, 0xc1, 0x80, 0x08,
0x66, 0x1d, 0x97, 0x47, 0xff, 0x0b, 0xe0, 0xb8,
0xbc, 0x03, 0x84, 0xc5, 0x89, 0x73, 0xd3, 0xd6,
0x96, 0x97, 0xc7, 0x96, 0xb7, 0x89, 0xf8, 0xc8,
0x25, 0x0b, 0x84, 0x45, 0xc7, 0xe5, 0x1d, 0xff,
0x04, 0x10, 0xe1, 0xd1, 0xe8, 0x70, 0xa2, 0xa7,
0x37, 0x34, 0x48, 0x9f, 0x4b, 0x1f, 0xf0, 0xb1,
0xf4, 0x1e, 0x9d, 0x9d, 0x9d, 0x14, 0x1b, 0x3a,
0xd1, 0x0d, 0xc2, 0xc3, 0x5d, 0x01, 0x8e, 0xcb,
0xd3, 0xfd, 0x07, 0x22, 0x89, 0xb3, 0x47, 0xc7,
0xf9, 0x4a, 0xfe, 0x0d, 0x0c, 0xc6, 0x61, 0x32,
0x8e, 0x57, 0x6b, 0x0b, 0x88, 0x0d, 0x1d, 0x17,
0xa1, 0xfd, 0x3d, 0x89, 0xe6, 0x3c, 0xd8, 0x8e,
0xc3, 0x51, 0xc1, 0xed, 0x6c, 0x2a, 0xe1, 0xda,
0xeb, 0xe5, 0x65, 0x68, 0xf2, 0x20, 0x84, 0x89,
0x3a, 0x7d, 0xc7, 0x36, 0x15, 0xf1, 0x2e, 0xff,
0x1c, 0x17, 0x4e, 0x5f, 0x0d, 0x9a, 0xa6, 0xf8,
0x2b, 0x0f, 0xb6, 0xd3, 0xf7, 0xd4, 0x58, 0xc6,
0x52, 0xe4, 0xa1, 0x22, 0x4b, 0x10, 0x01, 0x01,
0x1e, 0xe0, 0x28, 0xcb, 0x75, 0x08, 0xdb, 0x40,
0x41, 0xae, 0xa2, 0xa8, 0x56, 0x71, 0xfe, 0xd4,
0x45, 0x8b, 0xd8, 0x9f, 0x3c, 0xd8, 0x6f, 0xdf,
0xf1, 0x63, 0xe3, 0xdd, 0x87, 0xfa, 0x62, 0x94,
0xaf, 0xac, 0xc1, 0xe4, 0x06, 0x38, 0x37, 0x50,
0x51, 0x05, 0x54, 0x8d, 0xaf, 0x10, 0x36, 0x83,
0xb0, 0x19, 0x96, 0xbf, 0xbd, 0x40, 0xb8, 0x37,
0x44, 0x47, 0x0e, 0x0f, 0x87, 0x89, 0x35, 0xf2,
0xa0, 0x91, 0x8c, 0x99, 0x1e, 0xe8, 0x8e, 0x64,
0x6f, 0x4c, 0xdc, 0xb1, 0x05, 0x0f, 0x40, 0x41,
0xc2, 0x87, 0x87, 0xd7, 0xb9, 0x05, 0xbc, 0x2d,
0x3c, 0x83, 0x64, 0x15, 0x10, 0x23, 0x24, 0x06,
0x32, 0xd0, 0x5a, 0x43, 0x29, 0xa0, 0x5e, 0xaf,
0xe1, 0xf1, 0xd3, 0xf9, 0x4a, 0xb1, 0xb4, 0x39,
0x63, 0x12, 0x43, 0xea, 0x53, 0x6e, 0xc5, 0x9e,
0xb9, 0x77, 0xb9, 0xe1, 0x89, 0xa3, 0x7a, 0xf7,
0xfa, 0x13, 0xab, 0x2c, 0x73, 0xf0, 0x8d, 0x6d,
0x70, 0xc1, 0xc0, 0x4c, 0x82, 0xc1, 0x09, 0x73,
0x0f, 0x6e, 0x57, 0x65, 0x4d, 0x5b, 0xbf, 0xec,
0x07, 0x89, 0x21, 0x65, 0x2e, 0xcd, 0x7a, 0x4e,
0xd3, 0x26, 0xb4, 0xd6, 0x0a, 0xa5, 0xfa, 0x17,
0x30, 0x83, 0x60, 0x70, 0x06, 0x1e, 0x68, 0x40,
0x64, 0x4d, 0x5b, 0x2f, 0xe7, 0x3c, 0xda, 0xf5,
0x1d, 0x00, 0x80, 0xd2, 0x3e, 0x7e, 0xd4, 0x8b,
0x8d, 0x2b, 0xfb, 0x1a, 0xb2, 0xae, 0xa0, 0x55,
0xeb, 0x3f, 0x63, 0xb6, 0x6a, 0xfa, 0x4a, 0xa2,
0x5a, 0xdb, 0x86, 0x32, 0x35, 0xa0, 0x15, 0x7c,
0x49, 0xf0, 0xbd, 0x3d, 0x00, 0xa4, 0x2f, 0x11,
0x1f, 0xbc, 0x06, 0x62, 0x00, 0x31, 0x02, 0x11,
0xf6, 0x00, 0x20, 0x6c, 0xdc, 0xba, 0x3f, 0x19,
0x6e, 0x25, 0x26, 0xc2, 0x46, 0x73, 0xef, 0x27,
0x30, 0xf7, 0xc5, 0xdb, 0xb6, 0xd0, 0x9a, 0x22,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xae, 0x42, 0x60, 0x82};
/* go_up.png - 1418 bytes */
static const unsigned char go_up_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x09,
0x58, 0xf7, 0xdc, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x00, 0x48, 0x00,
0x00, 0x00, 0x48, 0x00, 0x46, 0xc9, 0x6b, 0x3e,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x04,
0xe7, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x4b, 0x4c, 0x13, 0x5b, 0x18, 0xfe, 0xce,
0x6b, 0xa0, 0xb4, 0x5c, 0xa2, 0x01, 0x04, 0x43,
0x45, 0x11, 0x44, 0x42, 0x34, 0x46, 0x2b, 0xa6,
0xad, 0x11, 0x8d, 0x29, 0x46, 0x03, 0x68, 0xa2,
0x18, 0x7c, 0xac, 0x94, 0xc0, 0xd2, 0x00, 0x81,
0xe8, 0xca, 0x85, 0xee, 0x8c, 0x8f, 0xb8, 0x30,
0xd1, 0x68, 0x22, 0x1b, 0x17, 0xb2, 0x20, 0x1a,
0x17, 0x86, 0x85, 0x92, 0x68, 0x1b, 0x5f, 0x1b,
0x5f, 0xc4, 0x88, 0x52, 0x5e, 0x4a, 0x0a, 0xad,
0x80, 0x50, 0x69, 0xcb, 0xcc, 0x9c, 0xbb, 0x98,
0x3b, 0xa9, 0x6d, 0xec, 0xbd, 0x12, 0xd1, 0x9b,
0xdc, 0xeb, 0xbf, 0xf9, 0x73, 0x26, 0x33, 0xe7,
0x7c, 0xdf, 0xff, 0x7f, 0xdf, 0x39, 0x67, 0x80,
0xdf, 0xf1, 0x3b, 0xfe, 0xdf, 0x41, 0x7e, 0xd6,
0xc4, 0x9b, 0x37, 0xb7, 0xb7, 0x33, 0x76, 0xe5,
0x0a, 0x00, 0x10, 0xb2, 0x74, 0x69, 0x7e, 0xbe,
0xdf, 0xaf, 0xaa, 0xbb, 0x77, 0x77, 0x76, 0x76,
0x76, 0x02, 0x9a, 0xb6, 0x50, 0xeb, 0xf0, 0x85,
0x06, 0xee, 0x76, 0xb7, 0xb7, 0x73, 0x7e, 0xe2,
0x44, 0x7e, 0x7e, 0x4e, 0xce, 0xb2, 0x65, 0x07,
0x0f, 0x02, 0x94, 0x02, 0x84, 0x8c, 0x8e, 0x4a,
0x39, 0x38, 0x78, 0xe9, 0x12, 0x00, 0x68, 0x5a,
0x53, 0xd3, 0x42, 0xad, 0xc7, 0x16, 0x6a, 0x22,
0x97, 0xab, 0xad, 0x8d, 0xb1, 0xbd, 0x7b, 0x17,
0x2d, 0xb2, 0xd9, 0x72, 0x72, 0xce, 0x9f, 0xaf,
0xae, 0xae, 0xac, 0xac, 0xaf, 0xb7, 0x5a, 0x8b,
0x8a, 0x0a, 0x0a, 0x4a, 0x4b, 0x85, 0x18, 0x18,
0xf8, 0xf8, 0xf1, 0xfd, 0xfb, 0xd5, 0xab, 0x97,
0x2c, 0x71, 0x38, 0x62, 0xb1, 0xa9, 0xa9, 0xa1,
0x21, 0x9f, 0x4f, 0xd7, 0x9f, 0x3e, 0xfd, 0xd7,
0x09, 0xb8, 0xdd, 0xcd, 0xcd, 0x42, 0x38, 0x1c,
0x56, 0xab, 0xc5, 0x62, 0xb3, 0xdd, 0xba, 0xb5,
0x6f, 0x9f, 0xc7, 0x73, 0xe4, 0x88, 0xd5, 0xda,
0xdb, 0x3b, 0x3e, 0xee, 0xf5, 0x02, 0x81, 0xc0,
0xf4, 0xb4, 0xdf, 0x0f, 0x38, 0x9d, 0x65, 0x65,
0x3b, 0x76, 0x28, 0x4a, 0x5f, 0xdf, 0xc0, 0x40,
0x6f, 0x6f, 0x65, 0x65, 0x6e, 0xee, 0xa6, 0x4d,
0x9a, 0xf6, 0xe4, 0xc9, 0xc8, 0x88, 0xcf, 0xa7,
0xeb, 0xfd, 0xfd, 0xbf, 0x9c, 0xc0, 0x96, 0x2d,
0x2d, 0x2d, 0x80, 0xdd, 0x4e, 0xa9, 0x10, 0x69,
0x69, 0x3e, 0x5f, 0x5d, 0x5d, 0x55, 0x55, 0x43,
0xc3, 0x1f, 0x7f, 0x04, 0x83, 0x91, 0x88, 0xdf,
0x0f, 0xf8, 0xfd, 0xa1, 0xd0, 0x8b, 0x17, 0xc0,
0xe7, 0xcf, 0xb3, 0xb3, 0xe3, 0xe3, 0x00, 0x63,
0x9c, 0x73, 0x0e, 0xac, 0x5b, 0x57, 0x5c, 0xec,
0x76, 0x2b, 0xca, 0xdb, 0xb7, 0x83, 0x83, 0xaf,
0x5e, 0xed, 0xd9, 0x63, 0xb7, 0xbb, 0x5c, 0x8c,
0x75, 0x75, 0x0d, 0x0f, 0x7b, 0xbd, 0x9a, 0x16,
0x0a, 0xcd, 0x17, 0x07, 0x9d, 0x7f, 0xc5, 0xdb,
0xdb, 0x81, 0xcc, 0x4c, 0x5d, 0xe7, 0x9c, 0xb1,
0x9e, 0x9e, 0xda, 0xda, 0xad, 0x5b, 0x0f, 0x1f,
0xce, 0xca, 0xd2, 0x75, 0xc6, 0xa2, 0x51, 0xa0,
0xbf, 0x3f, 0x14, 0x7a, 0xfe, 0x1c, 0xe0, 0x9c,
0x52, 0xce, 0x01, 0xc6, 0x28, 0x15, 0x02, 0xe8,
0xeb, 0x1b, 0x1b, 0x7b, 0xfa, 0x14, 0x08, 0x87,
0x35, 0x2d, 0x18, 0x04, 0x3c, 0x1e, 0x97, 0xab,
0xa6, 0x26, 0x33, 0x13, 0x90, 0x52, 0x55, 0xef,
0xdd, 0x73, 0x3a, 0x9b, 0x9b, 0x81, 0xc5, 0x8b,
0x7f, 0x1a, 0x81, 0xba, 0xba, 0xba, 0x3a, 0x80,
0x31, 0x29, 0x01, 0xce, 0xef, 0xdc, 0xa9, 0xaa,
0xaa, 0xa8, 0xd8, 0xbf, 0xdf, 0x6e, 0xcf, 0xcd,
0xcd, 0xce, 0xce, 0xcb, 0xa3, 0xf4, 0xcd, 0x9b,
0xb1, 0xb1, 0x47, 0x8f, 0xe2, 0x80, 0xbf, 0xce,
0x9c, 0x03, 0x00, 0x21, 0x84, 0x00, 0xcf, 0x9e,
0x0d, 0x0f, 0xdf, 0xbd, 0x0b, 0x58, 0xad, 0x36,
0x5b, 0x46, 0x06, 0x21, 0x6e, 0xf7, 0xfa, 0xf5,
0x1e, 0x4f, 0x6e, 0x2e, 0xa5, 0x42, 0x70, 0xde,
0xdd, 0xbd, 0x61, 0x43, 0x63, 0x23, 0x20, 0xc4,
0x82, 0x13, 0x18, 0x1d, 0x5d, 0xb1, 0x82, 0xb1,
0xcb, 0x97, 0x5d, 0xae, 0xf2, 0x72, 0x8f, 0xa7,
0xa2, 0xa2, 0xbc, 0xbc, 0xa4, 0xc4, 0xe1, 0x10,
0xe2, 0xf5, 0xeb, 0xd1, 0xd1, 0x07, 0x0f, 0x00,
0xc6, 0x08, 0x61, 0x0c, 0x10, 0x82, 0x73, 0x21,
0x80, 0xb4, 0x34, 0x45, 0x51, 0x14, 0x40, 0x08,
0x45, 0xa1, 0x14, 0x90, 0x92, 0xb1, 0x58, 0x0c,
0xa0, 0x54, 0x08, 0x29, 0x81, 0xc7, 0x8f, 0x87,
0x87, 0xbb, 0xba, 0x80, 0xc2, 0xc2, 0x82, 0x82,
0xa2, 0x22, 0xce, 0xd7, 0xac, 0x29, 0x2e, 0xde,
0xb8, 0xb1, 0xbc, 0xdc, 0x62, 0xc9, 0xca, 0x62,
0xac, 0xa3, 0xe3, 0x7b, 0x71, 0xfd, 0xa3, 0x07,
0x5c, 0xae, 0xd6, 0x56, 0xce, 0x5b, 0x5b, 0xcb,
0xca, 0x96, 0x2f, 0x77, 0x38, 0x8e, 0x1d, 0xdb,
0xb9, 0xd3, 0xed, 0xae, 0xaf, 0xb7, 0x58, 0x5e,
0xbe, 0xfc, 0xf0, 0xe1, 0xfe, 0x7d, 0x40, 0x55,
0x09, 0x89, 0x46, 0x0d, 0x8d, 0x13, 0x02, 0xc4,
0xeb, 0xcd, 0xb9, 0x94, 0x86, 0x64, 0x0c, 0x65,
0x33, 0xa6, 0x69, 0x00, 0x63, 0x8c, 0x11, 0x02,
0x00, 0x94, 0xea, 0x3a, 0x10, 0x08, 0xcc, 0xcc,
0xf4, 0xf7, 0x03, 0x4e, 0x67, 0x69, 0xe9, 0xae,
0x5d, 0x9c, 0x4f, 0x4c, 0x4c, 0x4e, 0x4e, 0x4c,
0xac, 0x5c, 0x69, 0xb3, 0xad, 0x5d, 0x3b, 0x39,
0xa9, 0xeb, 0x86, 0xc9, 0x1f, 0x3e, 0x4c, 0x85,
0x2f, 0xe5, 0x41, 0xe6, 0x74, 0xb6, 0xb4, 0x30,
0x56, 0x5d, 0x5d, 0x58, 0x98, 0x97, 0x57, 0x52,
0x72, 0xf3, 0xe6, 0xd1, 0xa3, 0x35, 0x35, 0xc7,
0x8f, 0x5b, 0x2c, 0x9c, 0x1b, 0x15, 0x96, 0x12,
0xd0, 0x75, 0x40, 0x4a, 0x42, 0x34, 0x0d, 0xe8,
0xe9, 0xf1, 0xfb, 0x3b, 0x3a, 0xe2, 0x84, 0x82,
0xc1, 0xd9, 0x59, 0xbf, 0x1f, 0x98, 0x9d, 0xd5,
0xb4, 0xe9, 0xe9, 0xaf, 0x67, 0x96, 0x12, 0x00,
0x6a, 0x6b, 0x57, 0xad, 0x6a, 0x6b, 0x03, 0xa4,
0xd4, 0x75, 0x29, 0x8d, 0x0c, 0x00, 0x91, 0x48,
0x2c, 0x16, 0x8d, 0x02, 0x5d, 0x5d, 0xdd, 0xdd,
0x37, 0x6e, 0x7c, 0xf9, 0x12, 0x0c, 0x86, 0x42,
0x23, 0x23, 0x07, 0x0e, 0x78, 0xbd, 0xe7, 0xce,
0x69, 0xda, 0xed, 0xdb, 0xc9, 0x38, 0x53, 0x1e,
0x64, 0x94, 0x32, 0x46, 0x48, 0x6b, 0xeb, 0xd0,
0x50, 0x20, 0xf0, 0xee, 0x9d, 0xc5, 0x72, 0xf2,
0xe4, 0xd5, 0xab, 0x0d, 0x0d, 0x5f, 0xb5, 0x8e,
0x09, 0x41, 0x48, 0x24, 0x72, 0xea, 0x54, 0x63,
0xe3, 0xb5, 0x6b, 0xe9, 0xe9, 0x42, 0x28, 0x0a,
0xe7, 0x40, 0x38, 0x1c, 0x8b, 0x05, 0x02, 0xc0,
0xdc, 0x1c, 0x63, 0xe1, 0x30, 0x20, 0x84, 0x10,
0xc6, 0x51, 0x66, 0xc2, 0x37, 0x08, 0x50, 0x6a,
0x74, 0xec, 0xe2, 0xc5, 0xeb, 0xd7, 0x4f, 0x9f,
0x8e, 0x44, 0x54, 0x35, 0x16, 0x93, 0x32, 0x3d,
0x3d, 0x11, 0x45, 0x46, 0x06, 0xc0, 0x39, 0x21,
0x2d, 0x2d, 0xc6, 0x78, 0x1e, 0x04, 0xbc, 0xde,
0x33, 0x67, 0x54, 0x75, 0xdb, 0xb6, 0xbf, 0x97,
0x96, 0x94, 0x94, 0x32, 0x66, 0x68, 0x5f, 0x51,
0x84, 0x00, 0x66, 0x66, 0xa2, 0xd1, 0xb1, 0x31,
0x40, 0x88, 0xb4, 0x34, 0x4a, 0x01, 0x4a, 0xe9,
0x5f, 0x3e, 0x33, 0x4c, 0x2c, 0xa5, 0x41, 0xc1,
0x94, 0x92, 0x09, 0xdc, 0xe7, 0x3b, 0x7b, 0x56,
0x55, 0xc9, 0xbc, 0xaf, 0x36, 0x3f, 0x7c, 0x95,
0xa0, 0x94, 0x52, 0x42, 0x80, 0x70, 0x58, 0x55,
0x3f, 0x7d, 0x32, 0xcc, 0xaa, 0xaa, 0x00, 0xe7,
0x8a, 0x62, 0x7a, 0x82, 0x10, 0x03, 0xbe, 0x41,
0xc0, 0x90, 0x0c, 0x21, 0xa6, 0x17, 0x7e, 0x2c,
0x16, 0x80, 0x80, 0xb1, 0xfb, 0x44, 0x22, 0xba,
0x3e, 0x35, 0x05, 0x10, 0x62, 0x54, 0xdc, 0x90,
0x20, 0xc0, 0xb9, 0x21, 0x21, 0x93, 0x88, 0xaa,
0xc6, 0x62, 0xba, 0x6e, 0xf6, 0xe3, 0x97, 0x11,
0x30, 0x17, 0x63, 0x2c, 0x31, 0xc7, 0x23, 0x12,
0x51, 0xd5, 0x70, 0x38, 0xfe, 0xae, 0x69, 0x4a,
0x5d, 0xd7, 0x34, 0xc3, 0xa4, 0x86, 0xf6, 0xa5,
0x34, 0x6f, 0xa2, 0xc6, 0x38, 0x31, 0x32, 0x32,
0x8c, 0x6c, 0xbe, 0x63, 0x66, 0x55, 0x9d, 0x27,
0x01, 0x13, 0xb0, 0x79, 0xa0, 0x70, 0x9e, 0x98,
0xe3, 0x07, 0x8d, 0x09, 0x6c, 0xfb, 0x76, 0xbb,
0xbd, 0xa9, 0xc9, 0xd8, 0x95, 0x74, 0xdd, 0xe8,
0x80, 0x31, 0x93, 0x59, 0xeb, 0xb8, 0x8d, 0x0d,
0x62, 0x86, 0x94, 0x12, 0x23, 0x33, 0x33, 0x11,
0xf0, 0xdc, 0x5c, 0xe2, 0x38, 0xf9, 0xb9, 0x94,
0x29, 0x08, 0x98, 0x40, 0xcd, 0x4a, 0x27, 0x03,
0x37, 0xc7, 0xc1, 0x60, 0x5b, 0xdb, 0x85, 0x0b,
0x87, 0x0e, 0x65, 0x67, 0x7f, 0x5f, 0x27, 0x53,
0x45, 0x30, 0x98, 0x5c, 0x98, 0x6f, 0x87, 0x49,
0x39, 0xde, 0xa1, 0x14, 0x3a, 0x34, 0xab, 0x95,
0x0a, 0x78, 0xf2, 0x38, 0x99, 0xa8, 0xb9, 0xf3,
0xc4, 0x77, 0xa0, 0x44, 0x00, 0x86, 0xbc, 0xe2,
0xd9, 0xac, 0x6c, 0xb2, 0x64, 0xcc, 0x4a, 0xc7,
0x62, 0x89, 0xd9, 0xfc, 0x6e, 0xde, 0x7f, 0x64,
0xa9, 0xbc, 0x60, 0xe6, 0x64, 0xe0, 0xc9, 0x5e,
0x31, 0x17, 0x4e, 0x26, 0x92, 0x0c, 0x3c, 0xd9,
0x27, 0xdf, 0xf2, 0xcb, 0x7f, 0x24, 0xfe, 0x04,
0xe4, 0x80, 0x1a, 0x0b, 0xa8, 0xf4, 0x5a, 0x14,
0x00, 0x00, 0x00, 0x22, 0x7a, 0x54, 0x58, 0x74,
0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65,
0x00, 0x00, 0x78, 0xda, 0x2b, 0x2f, 0x2f, 0xd7,
0xcb, 0xcc, 0xcb, 0x2e, 0x4e, 0x4e, 0x2c, 0x48,
0xd5, 0xcb, 0x2f, 0x4a, 0x07, 0x00, 0x36, 0xd8,
0x06, 0x58, 0x10, 0x53, 0xca, 0x5c, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};

177
art/tango/image_missing.h Normal file
View File

@@ -0,0 +1,177 @@
/* image_missing.png - 427 bytes */
static const unsigned char image_missing_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x09, 0x1b, 0x14, 0x11, 0x2b, 0xe0,
0x65, 0x44, 0x2f, 0x00, 0x00, 0x01, 0x38, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xbd, 0x93, 0xdf,
0x2a, 0x84, 0x51, 0x14, 0xc5, 0x7f, 0x6b, 0xef,
0x3d, 0x26, 0x92, 0x28, 0xe5, 0x02, 0xa5, 0x0c,
0x29, 0xb9, 0xf0, 0x3c, 0xde, 0xc2, 0x3b, 0x4c,
0xa6, 0x09, 0x6f, 0xe1, 0x8d, 0x4c, 0xa1, 0xa1,
0xdc, 0x71, 0xa1, 0xa6, 0x41, 0x92, 0xf9, 0xbe,
0xed, 0x42, 0xf3, 0x8d, 0x0f, 0x25, 0x73, 0x61,
0xd5, 0xe9, 0xfc, 0xdb, 0x7b, 0xed, 0x75, 0xce,
0x59, 0x47, 0x9d, 0x6e, 0xfb, 0x04, 0x38, 0x64,
0x3a, 0x9c, 0xd2, 0xe9, 0xb6, 0xb3, 0x2c, 0xcb,
0xa9, 0x5a, 0xa7, 0xdb, 0xce, 0x00, 0xc8, 0x4c,
0x7a, 0xbd, 0xde, 0x9f, 0x4a, 0xb7, 0x5a, 0x2d,
0x00, 0x02, 0x40, 0x52, 0xb5, 0xf0, 0x57, 0x54,
0x0a, 0xae, 0x6f, 0x2f, 0xeb, 0x1b, 0xd1, 0x20,
0xdc, 0x71, 0x0f, 0xdc, 0x83, 0x88, 0x20, 0xcc,
0xf1, 0x68, 0xe0, 0x1e, 0x34, 0x1b, 0xcd, 0x09,
0xc1, 0x18, 0xab, 0x2b, 0xeb, 0xd5, 0x58, 0xd2,
0x47, 0x8f, 0x48, 0x92, 0x71, 0x21, 0x00, 0x37,
0xab, 0x2b, 0xa8, 0x41, 0x70, 0xb3, 0xb4, 0x0c,
0xc0, 0xf6, 0x70, 0xc0, 0xd5, 0xc2, 0x22, 0x00,
0x5b, 0xc3, 0x01, 0x59, 0x26, 0x99, 0x25, 0xf6,
0x89, 0xc0, 0xbe, 0xe6, 0x9b, 0x9c, 0xed, 0xe1,
0x00, 0xa0, 0x4a, 0xde, 0x79, 0x7a, 0xc4, 0xcd,
0x30, 0x33, 0x24, 0xab, 0x11, 0xd4, 0x14, 0x98,
0x09, 0x49, 0xb5, 0x00, 0x80, 0x70, 0xa7, 0xcc,
0x04, 0x25, 0x08, 0x24, 0xab, 0x8e, 0x53, 0x8b,
0x94, 0x0c, 0x93, 0x71, 0x31, 0xbf, 0x00, 0xc0,
0xde, 0xeb, 0x2b, 0x00, 0xe7, 0xb3, 0x73, 0x98,
0x19, 0x66, 0xc2, 0x10, 0xe6, 0x3f, 0x28, 0x18,
0x57, 0x95, 0xc4, 0xee, 0xcb, 0x33, 0x32, 0xc7,
0x4c, 0xec, 0x8f, 0x46, 0x94, 0x09, 0x99, 0x05,
0x59, 0x24, 0x32, 0xe1, 0x32, 0x0a, 0x8a, 0x3a,
0x81, 0x64, 0xdc, 0x3f, 0xdc, 0x11, 0x1e, 0xc4,
0xf8, 0xe9, 0xdc, 0xf1, 0x98, 0xcc, 0xdd, 0x83,
0xc6, 0xcc, 0x0c, 0xfa, 0xe9, 0x0e, 0x36, 0xd6,
0x36, 0x7f, 0x77, 0x4d, 0xc2, 0xe8, 0xad, 0x60,
0xf4, 0x56, 0x7c, 0x27, 0xe8, 0xf7, 0xfb, 0xff,
0x6b, 0xe5, 0x66, 0x73, 0xe2, 0xc4, 0xb3, 0xee,
0xf1, 0xd1, 0xc1, 0xb4, 0xdf, 0xf9, 0x1d, 0x01,
0x9f, 0x8d, 0x9b, 0x4e, 0xf5, 0x76, 0x91, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};
/* image_missing.png - 933 bytes */
static const unsigned char image_missing_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x03,
0x30, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x4d, 0x4b, 0x32, 0x51, 0x14, 0x3e, 0xf7,
0x5e, 0x75, 0x4a, 0xc5, 0x85, 0x68, 0x23, 0x85,
0x43, 0x44, 0xb6, 0x28, 0xdc, 0xd4, 0x4f, 0x90,
0xda, 0xb8, 0xc9, 0xbe, 0x7e, 0x81, 0xbf, 0xa0,
0xa0, 0x22, 0x5b, 0x16, 0x84, 0xab, 0x3e, 0xb6,
0x1a, 0xd6, 0xae, 0x45, 0xfd, 0x86, 0x5a, 0xd4,
0xd6, 0x40, 0x89, 0x56, 0x21, 0x42, 0x30, 0x82,
0xd8, 0xe0, 0xe0, 0x30, 0xe2, 0x7c, 0xbc, 0x8b,
0xdb, 0x65, 0xd0, 0x92, 0x99, 0x7a, 0x45, 0xe1,
0xe5, 0x7d, 0x36, 0x87, 0x7b, 0xe7, 0xcc, 0x9d,
0xe7, 0x39, 0xe7, 0xcc, 0x3d, 0xf7, 0x02, 0xfc,
0xc7, 0x68, 0x81, 0x7a, 0x27, 0x4e, 0x4e, 0xb2,
0xd9, 0xe3, 0xe3, 0xad, 0x2d, 0x3a, 0xba, 0xb9,
0x19, 0x35, 0xc1, 0x6e, 0xec, 0xed, 0xed, 0xef,
0xef, 0xee, 0x66, 0x32, 0xd9, 0x6c, 0x5f, 0x17,
0x2a, 0xc0, 0x34, 0x45, 0x51, 0x14, 0x45, 0xd1,
0x1c, 0x39, 0x64, 0x59, 0x96, 0x65, 0xd9, 0x34,
0x19, 0xaf, 0x5e, 0xbe, 0xae, 0x7e, 0x42, 0x78,
0x9e, 0xe7, 0x79, 0x1e, 0xa0, 0x54, 0x2a, 0x95,
0x4a, 0xa5, 0x6f, 0x52, 0x87, 0x10, 0x42, 0xe8,
0xeb, 0xf8, 0xa7, 0xf3, 0x76, 0x7e, 0xb1, 0x58,
0x2c, 0x16, 0x8b, 0x59, 0xe3, 0x74, 0x3a, 0x9d,
0x4e, 0xa7, 0x31, 0xce, 0xe5, 0x72, 0xb9, 0x5c,
0xce, 0x30, 0xfa, 0x0a, 0x60, 0x88, 0xc7, 0xe3,
0xf1, 0x78, 0x7c, 0x68, 0x35, 0xe2, 0x10, 0x96,
0x44, 0x5b, 0x01, 0xe5, 0xf2, 0xeb, 0xeb, 0xf3,
0xb3, 0xfd, 0x72, 0x84, 0x60, 0x8c, 0x31, 0x00,
0xc6, 0xd4, 0x22, 0x84, 0x10, 0x1d, 0x13, 0x42,
0x08, 0x00, 0xc6, 0x34, 0xb2, 0xbd, 0x7e, 0x18,
0x63, 0xec, 0x72, 0x75, 0x8f, 0x11, 0xa2, 0xfe,
0x84, 0x00, 0x84, 0xc3, 0xa1, 0x10, 0xcf, 0xf7,
0xff, 0xb6, 0xad, 0x00, 0x86, 0xa9, 0x29, 0x9e,
0x8f, 0x46, 0x87, 0x17, 0x63, 0xd3, 0x04, 0x30,
0x0c, 0x7b, 0x3f, 0x3c, 0x3c, 0x4a, 0x3f, 0x03,
0xc6, 0x18, 0x13, 0x32, 0x44, 0x01, 0x6f, 0x6f,
0xc1, 0x60, 0x28, 0x64, 0x59, 0x45, 0xb9, 0xbf,
0x7f, 0x78, 0xb0, 0x9e, 0xbf, 0xbf, 0x2f, 0x2f,
0xaf, 0xac, 0x00, 0x54, 0x2a, 0xb3, 0xb3, 0x73,
0x73, 0xce, 0x04, 0x60, 0x07, 0xec, 0x6c, 0x5d,
0x10, 0xa2, 0x35, 0x69, 0x87, 0x89, 0x89, 0x7c,
0x3e, 0x97, 0xb3, 0xc6, 0xa2, 0xb8, 0xb6, 0xb6,
0xbe, 0x0e, 0xd0, 0x6c, 0x16, 0x0a, 0x57, 0x57,
0x00, 0xba, 0x5e, 0xab, 0xd5, 0x6a, 0x00, 0x5e,
0x6f, 0x22, 0x91, 0x48, 0x38, 0x13, 0x30, 0x90,
0x0c, 0x10, 0xe2, 0x6c, 0x21, 0xbf, 0x3f, 0x95,
0x5a, 0x5d, 0x05, 0x88, 0x44, 0xee, 0xee, 0x6e,
0x6f, 0xad, 0xf9, 0x7a, 0x7d, 0x7b, 0x7b, 0x67,
0x07, 0x40, 0xd7, 0x1b, 0x8d, 0x8f, 0x0f, 0x00,
0x8f, 0x67, 0x61, 0x61, 0x7e, 0xde, 0x99, 0x80,
0x81, 0x64, 0xc0, 0xe9, 0x42, 0x0c, 0x9a, 0x56,
0xa9, 0x54, 0x2a, 0x00, 0x1c, 0xb7, 0xb4, 0xb4,
0xb8, 0x68, 0xcd, 0x9b, 0xa6, 0xa2, 0x28, 0x0a,
0x00, 0xc6, 0x81, 0x40, 0x20, 0x60, 0xbf, 0x8e,
0xd3, 0xc0, 0x39, 0x12, 0xe0, 0x64, 0x21, 0x49,
0x3a, 0x3f, 0xbf, 0xb8, 0x00, 0x90, 0xa4, 0xd3,
0xd3, 0xb3, 0x33, 0x00, 0xc3, 0x90, 0x65, 0x59,
0x06, 0x10, 0x84, 0x97, 0x97, 0x72, 0xd9, 0xf2,
0x63, 0x19, 0x61, 0xa5, 0xd5, 0x0f, 0x08, 0xd1,
0xed, 0xd7, 0x0e, 0xb6, 0xdb, 0x68, 0xbf, 0x0c,
0x68, 0x9a, 0x28, 0x8a, 0x22, 0x40, 0xb3, 0x99,
0xcf, 0x5f, 0x5e, 0x02, 0xa8, 0xea, 0xe3, 0xe3,
0xd3, 0x13, 0x80, 0xdf, 0xbf, 0xb9, 0xb9, 0xb1,
0x41, 0x4b, 0x2a, 0x95, 0x02, 0x70, 0xb9, 0x22,
0x91, 0x48, 0x04, 0x60, 0x66, 0xa6, 0xd1, 0xa8,
0xd7, 0xed, 0x09, 0x59, 0x19, 0xa0, 0x7d, 0x64,
0x00, 0x02, 0x68, 0x43, 0xf9, 0xf2, 0xe2, 0x27,
0xb1, 0x60, 0x30, 0x93, 0x39, 0x38, 0x70, 0x4e,
0xcc, 0x29, 0x30, 0x26, 0x64, 0x20, 0x02, 0x08,
0xa1, 0x0b, 0x29, 0x8a, 0xaa, 0xd2, 0x1a, 0x66,
0x9d, 0x92, 0x96, 0x16, 0xeb, 0xac, 0x08, 0x59,
0x9d, 0x94, 0xce, 0xd3, 0x08, 0x22, 0x44, 0xdf,
0x67, 0x81, 0x60, 0xc4, 0xac, 0xe7, 0xbd, 0x9d,
0x99, 0xfa, 0x39, 0xd9, 0xf9, 0x1c, 0x09, 0x88,
0x46, 0x27, 0x27, 0xa7, 0xa7, 0x07, 0x1f, 0xe1,
0x41, 0xc1, 0x56, 0x40, 0xb5, 0x5a, 0xad, 0x56,
0xab, 0xbf, 0x3f, 0x4d, 0xfe, 0xed, 0x29, 0x35,
0x1c, 0x0e, 0x87, 0xc3, 0xe1, 0x5f, 0x08, 0xa8,
0xd5, 0x68, 0xe3, 0x11, 0x04, 0x41, 0x10, 0x84,
0xd1, 0x45, 0x98, 0xf1, 0xe8, 0x86, 0x75, 0x4a,
0xea, 0x23, 0xe0, 0xe8, 0xa8, 0x50, 0xb8, 0xbe,
0xce, 0xe7, 0x0f, 0x0f, 0x47, 0x47, 0xfd, 0x7b,
0x5e, 0xf4, 0x1e, 0x60, 0x5d, 0x6c, 0xfa, 0xfe,
0x2a, 0xc9, 0x64, 0x32, 0x99, 0x4c, 0x8e, 0x8f,
0x1b, 0x86, 0x61, 0x18, 0x06, 0xcf, 0x4b, 0x92,
0x24, 0x49, 0x92, 0xd7, 0xdb, 0x6a, 0xb5, 0x5a,
0xad, 0x96, 0xd7, 0xab, 0xaa, 0xaa, 0xaa, 0xaa,
0x5e, 0xaf, 0xa6, 0x69, 0x9a, 0xa6, 0x8d, 0x8d,
0xe9, 0xba, 0xae, 0xeb, 0x3a, 0xc7, 0x51, 0xeb,
0xf1, 0xd0, 0xfb, 0x94, 0xcb, 0x45, 0x2d, 0x21,
0xb4, 0x34, 0x4c, 0x93, 0x5a, 0x4d, 0xa3, 0x3f,
0x6d, 0xa7, 0x43, 0x08, 0x21, 0x84, 0xb4, 0xdb,
0x6e, 0xb7, 0xdb, 0xed, 0x76, 0x2b, 0x0a, 0xc7,
0x71, 0x1c, 0xc7, 0x29, 0x8a, 0xcf, 0xe7, 0xf3,
0xf9, 0x7c, 0xad, 0x56, 0xbb, 0xdd, 0x6e, 0xb7,
0xdb, 0xa2, 0x58, 0x2c, 0x16, 0x8b, 0xc5, 0xa2,
0x24, 0x39, 0xcc, 0x00, 0x43, 0xa7, 0x43, 0x2d,
0xdb, 0xc1, 0x5d, 0x9f, 0xfe, 0x6c, 0x63, 0x65,
0x04, 0xdd, 0x6e, 0x6a, 0x31, 0xee, 0xb6, 0x84,
0xd0, 0x00, 0xd0, 0xbd, 0x06, 0x63, 0x16, 0x39,
0x5d, 0xa7, 0xcf, 0x19, 0x11, 0x66, 0x35, 0xed,
0x7b, 0xab, 0x28, 0xbd, 0xc4, 0xff, 0x19, 0xfc,
0x01, 0x61, 0x10, 0xe0, 0xf6, 0xa1, 0x33, 0x75,
0x81, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};

109
art/tango/list_add.h Normal file
View File

@@ -0,0 +1,109 @@
/* list_add.png - 323 bytes */
static const unsigned char list_add_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd6, 0x01, 0x0b, 0x10, 0x00, 0x11, 0x94,
0x44, 0x78, 0xa1, 0x00, 0x00, 0x00, 0xd0, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xcd, 0x91, 0xbd,
0x0e, 0xc1, 0x60, 0x14, 0x86, 0x1f, 0xd2, 0xc5,
0x60, 0xb7, 0x72, 0x07, 0xd2, 0xba, 0x81, 0xc6,
0x60, 0x36, 0x5b, 0x3b, 0x74, 0x71, 0x07, 0x44,
0xd2, 0xc4, 0x64, 0x17, 0xb1, 0x5a, 0x0d, 0x26,
0x83, 0x84, 0x1b, 0xe8, 0x67, 0x37, 0x5a, 0x2c,
0x56, 0x69, 0xe2, 0xa7, 0xdf, 0x31, 0x10, 0x8a,
0xfa, 0x8b, 0x04, 0xef, 0x76, 0xf2, 0x9d, 0xbc,
0xf9, 0x9e, 0xe7, 0xc0, 0xaf, 0x93, 0xb8, 0xf7,
0x60, 0x39, 0x3d, 0x1f, 0x30, 0x8f, 0xa3, 0xf2,
0xbb, 0x15, 0x2b, 0x6e, 0x2f, 0xf9, 0xa0, 0xdc,
0xf4, 0x5c, 0x1b, 0xcf, 0xb5, 0x89, 0x14, 0xbd,
0x55, 0xf0, 0x52, 0x3e, 0x2e, 0x30, 0xee, 0x30,
0xc7, 0x39, 0x91, 0xc8, 0x78, 0x72, 0x62, 0x44,
0x99, 0x5b, 0xd5, 0x22, 0x5b, 0x2d, 0x24, 0x80,
0x6d, 0x78, 0xde, 0xf7, 0x5c, 0x1b, 0x11, 0x10,
0x39, 0x58, 0xaf, 0x77, 0xc6, 0xe6, 0xcd, 0x0f,
0x00, 0x56, 0xeb, 0x90, 0xf9, 0x32, 0x40, 0x04,
0xb4, 0x16, 0xb4, 0x40, 0xb0, 0x11, 0xc2, 0x50,
0xd8, 0x69, 0x41, 0x6b, 0xc8, 0x65, 0x52, 0xf1,
0x08, 0x80, 0x6a, 0x74, 0x26, 0x17, 0x08, 0xe5,
0x52, 0x01, 0x80, 0xc1, 0xc8, 0xbf, 0x26, 0x52,
0x4f, 0xe5, 0x58, 0x4e, 0x4f, 0x86, 0xd3, 0x85,
0x34, 0xfb, 0x33, 0xb9, 0xe2, 0xff, 0xf2, 0x19,
0xf3, 0xd9, 0xf4, 0x6b, 0x67, 0x8c, 0x89, 0xaa,
0xb5, 0x4f, 0xb6, 0x15, 0x7f, 0x9b, 0x3d, 0x54,
0x72, 0x4b, 0x0b, 0x8b, 0xb2, 0x77, 0x8e, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82};
/* list_add.png - 494 bytes */
static const unsigned char list_add_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x01,
0x79, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x56, 0xb1, 0x8a, 0xc2, 0x40, 0x10, 0x7d, 0x89,
0x27, 0x28, 0x36, 0x5a, 0x08, 0x56, 0x16, 0x56,
0xf6, 0x49, 0x29, 0x82, 0xe8, 0x67, 0xa4, 0xb1,
0x10, 0x0b, 0x41, 0xfc, 0x02, 0x89, 0x85, 0xd8,
0xf8, 0x03, 0xc1, 0xd6, 0x5f, 0xb0, 0xd5, 0xc2,
0xc2, 0x26, 0xdb, 0xd8, 0x5b, 0x58, 0xdb, 0x58,
0xa8, 0x28, 0x66, 0x77, 0xaf, 0x58, 0x82, 0x24,
0x27, 0x26, 0xf1, 0x92, 0xc3, 0x83, 0x7d, 0x45,
0x36, 0x3b, 0xc9, 0xcc, 0xbe, 0xb7, 0x99, 0x99,
0x2c, 0x20, 0x21, 0x21, 0xf1, 0xaf, 0xa1, 0xc4,
0x1d, 0x50, 0xd7, 0x3b, 0x9d, 0xf9, 0xdc, 0xb6,
0xc5, 0x4c, 0xd3, 0xbc, 0x4f, 0x09, 0xb1, 0xed,
0xd9, 0xcc, 0x30, 0x74, 0x3d, 0xae, 0xf5, 0xd4,
0x64, 0xf6, 0x45, 0xd3, 0x46, 0xa3, 0x6e, 0xb7,
0xd1, 0x00, 0x4c, 0x53, 0x8c, 0xcf, 0x05, 0x7d,
0xac, 0x80, 0xbf, 0x83, 0x14, 0x10, 0x04, 0xce,
0x93, 0x8d, 0xff, 0x15, 0xf6, 0xc5, 0xd7, 0xc5,
0xf9, 0x8a, 0xb8, 0x57, 0x82, 0x88, 0x13, 0x24,
0x2b, 0x7c, 0xb1, 0x87, 0x16, 0xe0, 0x12, 0x9f,
0x4e, 0xfb, 0xfd, 0x56, 0x0b, 0xb8, 0xdf, 0x19,
0xe3, 0x1c, 0x50, 0x7c, 0x7d, 0x4c, 0x55, 0x55,
0x55, 0x55, 0x81, 0xf3, 0xf9, 0x7a, 0x75, 0x1c,
0x80, 0x73, 0x41, 0x76, 0x32, 0xe9, 0xf5, 0x9a,
0x4d, 0xc0, 0x71, 0x84, 0x9f, 0x6b, 0x77, 0x47,
0x37, 0xce, 0x70, 0x68, 0x59, 0xcb, 0x65, 0xf8,
0x62, 0x8f, 0x28, 0x00, 0x38, 0x9d, 0x6e, 0x37,
0x4a, 0x81, 0xfd, 0xfe, 0x70, 0xb8, 0x5c, 0x1e,
0x04, 0x18, 0x13, 0xc4, 0xc4, 0x15, 0xa0, 0x54,
0xdc, 0x51, 0xca, 0x18, 0x20, 0x88, 0x0b, 0x3b,
0xa5, 0x9c, 0x3f, 0x84, 0x30, 0x26, 0xec, 0x95,
0x4a, 0xa9, 0x94, 0xcd, 0x46, 0x65, 0x13, 0x59,
0x00, 0x21, 0xa6, 0x69, 0x59, 0xab, 0x55, 0xf0,
0x0e, 0x0d, 0x06, 0x86, 0x51, 0xaf, 0x03, 0x84,
0xec, 0x76, 0xc7, 0x23, 0xb0, 0x5e, 0x6f, 0x36,
0xdb, 0x6d, 0xf8, 0x75, 0x62, 0x17, 0x10, 0x36,
0x27, 0xdd, 0x1c, 0x57, 0x94, 0x57, 0x71, 0x94,
0xd8, 0x7e, 0xa0, 0x89, 0x75, 0xa1, 0x7c, 0x3e,
0x97, 0x4b, 0xa7, 0x1f, 0x29, 0x95, 0x14, 0x12,
0x6c, 0xa3, 0xde, 0x22, 0xfd, 0x70, 0x01, 0xa9,
0x94, 0xdf, 0x52, 0x2e, 0x17, 0x8b, 0x99, 0x0c,
0x50, 0xab, 0x55, 0xab, 0x85, 0x42, 0x90, 0xff,
0xfb, 0x29, 0x15, 0xb9, 0x0b, 0x3d, 0x07, 0xa5,
0xde, 0x39, 0x21, 0xed, 0xf6, 0x78, 0xbc, 0x58,
0xfc, 0x3c, 0xcc, 0x3d, 0xf7, 0x7f, 0xff, 0x2b,
0xc5, 0x7c, 0x1a, 0x75, 0x77, 0xd2, 0x3f, 0xfa,
0x89, 0x8a, 0xd6, 0x29, 0x21, 0x21, 0xf1, 0x7b,
0x7c, 0x03, 0xa0, 0xdd, 0xbc, 0x3f, 0x8b, 0x9a,
0x1d, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};

76
art/tango/list_remove.h Normal file
View File

@@ -0,0 +1,76 @@
/* list_remove.png - 247 bytes */
static const unsigned char list_remove_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9,
0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd6, 0x01, 0x0b, 0x0f, 0x3b, 0x22, 0x00,
0x5c, 0x12, 0xc2, 0x00, 0x00, 0x00, 0x84, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xed, 0x91, 0xb1,
0x09, 0x83, 0x50, 0x10, 0x86, 0xbf, 0x07, 0x69,
0xdc, 0xc0, 0x3a, 0x2b, 0xe8, 0x08, 0x19, 0x23,
0xad, 0x6d, 0x46, 0x08, 0x19, 0x20, 0x0b, 0x88,
0xad, 0x73, 0xc4, 0x05, 0x74, 0x88, 0xd4, 0xb6,
0x22, 0x44, 0xf3, 0xee, 0x4f, 0x21, 0xca, 0xb3,
0xb3, 0x33, 0x85, 0x1f, 0x1c, 0x1c, 0x07, 0xff,
0x77, 0x1c, 0x07, 0x07, 0xfb, 0xe3, 0xe6, 0x26,
0xcd, 0xca, 0x1a, 0x48, 0x36, 0xe6, 0x9a, 0xba,
0xb8, 0xa6, 0x00, 0xa7, 0x60, 0x98, 0x3c, 0x6f,
0x17, 0x46, 0x13, 0x0e, 0x18, 0xbd, 0x56, 0x09,
0x69, 0x2a, 0x07, 0xdc, 0xf3, 0xd7, 0xb2, 0x28,
0x14, 0xd0, 0x7d, 0x3c, 0xef, 0xb6, 0x47, 0x02,
0x33, 0x61, 0x82, 0x7e, 0x10, 0xde, 0x8b, 0xaf,
0x09, 0x33, 0x38, 0xc7, 0xd1, 0x4a, 0x1c, 0x0a,
0x9a, 0x47, 0x5e, 0x6d, 0x3e, 0xe1, 0xf8, 0xfe,
0x3f, 0xf1, 0x03, 0xac, 0x53, 0x2d, 0xdb, 0x46,
0xe4, 0x80, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
/* list_remove.png - 306 bytes */
static const unsigned char list_remove_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x00,
0xbd, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0xd2, 0xbb, 0x0d, 0x83, 0x30, 0x10, 0x06, 0xe0,
0x1f, 0x29, 0x0d, 0x1b, 0x50, 0xb3, 0x82, 0x3d,
0x02, 0x63, 0xd0, 0xd2, 0x32, 0x02, 0x62, 0x00,
0x16, 0xb0, 0x68, 0x99, 0x83, 0x2c, 0x60, 0x0f,
0x41, 0x4d, 0x8b, 0x90, 0x90, 0x7d, 0x76, 0x0a,
0x07, 0xa5, 0x0c, 0x96, 0x82, 0xd2, 0xdc, 0x57,
0xf8, 0xa5, 0xd3, 0xe9, 0xee, 0x64, 0x80, 0x31,
0xc6, 0x18, 0x63, 0xff, 0x93, 0x5d, 0x0d, 0x94,
0xb2, 0x69, 0xa6, 0x49, 0xeb, 0x78, 0x13, 0xe2,
0xde, 0xb2, 0x8c, 0xd1, 0x7a, 0x1c, 0xeb, 0x5a,
0xca, 0x6f, 0x91, 0x8f, 0xb4, 0xc4, 0x42, 0x0c,
0x43, 0xdb, 0x56, 0x15, 0x60, 0xad, 0xf7, 0x21,
0x00, 0xd9, 0x7b, 0x04, 0xd6, 0x12, 0x85, 0x70,
0x3d, 0x53, 0x08, 0x31, 0xfa, 0xdc, 0xcf, 0x3c,
0x5d, 0xa7, 0xd4, 0x3c, 0x5f, 0x1f, 0x50, 0x62,
0x03, 0xc0, 0xb6, 0x1d, 0x07, 0x11, 0xb0, 0x2c,
0xeb, 0xba, 0xef, 0x9f, 0x02, 0xbc, 0x8f, 0x0d,
0xc5, 0x15, 0x20, 0x8a, 0x27, 0x22, 0xef, 0x01,
0xc0, 0xb9, 0xb8, 0x13, 0xc5, 0x46, 0x9d, 0x3b,
0xe3, 0xe3, 0x7b, 0x59, 0x16, 0x45, 0x9e, 0xa7,
0x56, 0x93, 0xdc, 0x80, 0x31, 0x7d, 0xaf, 0xd4,
0xf3, 0x79, 0xff, 0x17, 0xba, 0x37, 0x3f, 0x63,
0x8c, 0x31, 0xc6, 0x7e, 0xe3, 0x05, 0xb5, 0x9e,
0x63, 0xa8, 0xa1, 0xbc, 0x32, 0xe6, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82};

134
art/tango/text_x_generic.h Normal file
View File

@@ -0,0 +1,134 @@
/* text_x_generic.png - 333 bytes */
static const unsigned char text_x_generic_16x16_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10,
0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00,
0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18,
0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45,
0x07, 0xd5, 0x04, 0x16, 0x14, 0x0f, 0x38, 0xba,
0x60, 0x26, 0x42, 0x00, 0x00, 0x00, 0xda, 0x49,
0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x92, 0x3d,
0x6e, 0x84, 0x30, 0x10, 0x85, 0xbf, 0x07, 0x48,
0xbb, 0x5b, 0x21, 0x21, 0x9f, 0x81, 0x9f, 0xb3,
0x6c, 0x99, 0x22, 0xc7, 0x41, 0xe6, 0x16, 0x1c,
0x21, 0x51, 0xda, 0x1c, 0x06, 0x73, 0x01, 0x1a,
0xfa, 0xad, 0x4c, 0x8a, 0x88, 0x15, 0x24, 0x5e,
0x58, 0xa2, 0xbc, 0x6a, 0x2c, 0x7b, 0xde, 0x7c,
0x33, 0x1e, 0xb5, 0x6d, 0xfb, 0x31, 0x0c, 0xc3,
0x0b, 0xc7, 0xf4, 0x5a, 0xd7, 0xf5, 0x3b, 0x00,
0xd6, 0xda, 0xe9, 0xa8, 0xac, 0xb5, 0xd3, 0xec,
0x94, 0xcc, 0xc1, 0x38, 0x8e, 0x78, 0xef, 0x01,
0x90, 0x74, 0x2f, 0x35, 0xc7, 0x92, 0x88, 0xe3,
0x98, 0x34, 0x4d, 0x57, 0x28, 0x77, 0x03, 0xef,
0x3d, 0xce, 0xb9, 0x55, 0xc2, 0x52, 0x92, 0xa8,
0xaa, 0xea, 0x57, 0x2f, 0xc9, 0xf2, 0x50, 0x14,
0xc5, 0x26, 0x41, 0x48, 0xc9, 0xf2, 0xe1, 0x92,
0xe0, 0xa7, 0x9e, 0x22, 0xc8, 0xf3, 0x3c, 0x50,
0xf1, 0xc6, 0x34, 0x9d, 0x88, 0xa2, 0x68, 0x9b,
0x00, 0xa0, 0xef, 0xfb, 0xd5, 0x65, 0x59, 0x96,
0xc0, 0x05, 0xb8, 0x01, 0xe7, 0xfd, 0x16, 0x42,
0x04, 0x92, 0x90, 0x2e, 0x0f, 0x17, 0x62, 0x45,
0xe0, 0x9c, 0xdb, 0x1c, 0xde, 0x37, 0xd1, 0xce,
0x2f, 0x84, 0x09, 0xb4, 0x4f, 0x20, 0x89, 0xae,
0xeb, 0x82, 0x95, 0xe7, 0xe9, 0x87, 0x8c, 0x82,
0x04, 0x21, 0x93, 0xdd, 0x3d, 0xc8, 0xb2, 0x8c,
0xbf, 0x28, 0x31, 0xc6, 0x7c, 0x36, 0x4d, 0x73,
0x3d, 0x92, 0x64, 0x8c, 0x79, 0xe3, 0xbf, 0xf4,
0x05, 0x54, 0x51, 0x5f, 0xb9, 0xfc, 0xb9, 0x3f,
0xec, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82};
/* text_x_generic.png - 687 bytes */
static const unsigned char text_x_generic_24x24_png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x10, 0x06, 0x00, 0x00, 0x00, 0xb0, 0xe7, 0xe1,
0xbb, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47,
0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0,
0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70,
0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00,
0x00, 0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78,
0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67,
0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18,
0x00, 0x78, 0x4c, 0xa5, 0xa6, 0x00, 0x00, 0x02,
0x3a, 0x49, 0x44, 0x41, 0x54, 0x58, 0xc3, 0xed,
0x57, 0x4b, 0x6b, 0xab, 0x50, 0x10, 0x1e, 0x5f,
0xab, 0xb6, 0x5b, 0x45, 0xfc, 0x03, 0x06, 0x15,
0x5f, 0x94, 0x44, 0xdb, 0x7f, 0xd3, 0x1f, 0x51,
0x0a, 0x69, 0x17, 0x7d, 0xd1, 0xc7, 0x0f, 0xeb,
0x8b, 0x82, 0x08, 0xa2, 0xb8, 0x11, 0xda, 0x2e,
0x04, 0x85, 0x42, 0xa1, 0x74, 0x51, 0xd4, 0x2e,
0x64, 0xae, 0xd4, 0xe4, 0x60, 0xbc, 0x89, 0x09,
0x17, 0xee, 0xb7, 0x19, 0xce, 0x19, 0xf5, 0x7c,
0xdf, 0xcc, 0x9c, 0x99, 0x04, 0xe0, 0x3f, 0x36,
0x0b, 0x8a, 0xe4, 0xb8, 0xba, 0xba, 0xb9, 0xb9,
0xb8, 0x38, 0x3d, 0xad, 0x57, 0xc7, 0xc7, 0x9b,
0x22, 0x58, 0x55, 0x55, 0x55, 0x55, 0x67, 0x67,
0x47, 0x47, 0x87, 0x87, 0xd3, 0xe9, 0xc9, 0xc9,
0xc2, 0x2f, 0xd6, 0x02, 0xaa, 0x8d, 0x03, 0x79,
0x90, 0x78, 0xb2, 0x8b, 0x0a, 0x4a, 0x92, 0x24,
0x49, 0x12, 0x00, 0x86, 0x61, 0x18, 0x86, 0xc1,
0xc8, 0x00, 0x50, 0x14, 0x45, 0x51, 0x54, 0x63,
0xff, 0xa4, 0x96, 0xb0, 0xdf, 0xf6, 0xcf, 0x8f,
0x38, 0x80, 0x24, 0x49, 0x92, 0x24, 0x75, 0xf3,
0x5a, 0x58, 0x00, 0x89, 0x50, 0x10, 0x04, 0x41,
0x10, 0x74, 0x13, 0xeb, 0x82, 0x61, 0x18, 0x86,
0x61, 0x34, 0x02, 0x16, 0xc5, 0xd2, 0x02, 0x54,
0x55, 0x55, 0x55, 0x15, 0x80, 0x65, 0x59, 0x96,
0x9d, 0xf3, 0xb5, 0xa2, 0x28, 0x8a, 0xa2, 0x20,
0xfb, 0x49, 0xe7, 0x0c, 0x2e, 0x00, 0xad, 0xef,
0xfb, 0xbe, 0xef, 0xf7, 0x0a, 0xf6, 0x5c, 0x98,
0xa6, 0x69, 0x9a, 0x26, 0x00, 0x4d, 0xd3, 0x34,
0x4d, 0x0f, 0x28, 0x00, 0x0f, 0xc0, 0x54, 0xeb,
0xba, 0xae, 0xeb, 0x7a, 0xf3, 0x1c, 0xc7, 0x71,
0x1c, 0xc7, 0x2d, 0x2f, 0x68, 0xe5, 0x02, 0x9e,
0x9e, 0x9e, 0x9f, 0x1f, 0x1f, 0x01, 0x1c, 0x67,
0x3c, 0x76, 0xdd, 0x46, 0x90, 0xe7, 0x79, 0x9e,
0xe7, 0x2d, 0x4f, 0xc4, 0x71, 0x1c, 0xc7, 0x71,
0x9a, 0x92, 0x5b, 0xb9, 0x80, 0xf1, 0x78, 0x77,
0x77, 0x32, 0x01, 0x10, 0x45, 0x51, 0x14, 0x45,
0x80, 0x34, 0x4d, 0xd3, 0x34, 0x05, 0xb0, 0x2c,
0xcb, 0xb2, 0xac, 0x1e, 0x07, 0xb6, 0xee, 0x02,
0xa9, 0x7b, 0xad, 0x5c, 0x00, 0x7e, 0x18, 0x89,
0xe3, 0x3a, 0x8e, 0xe3, 0x38, 0x8e, 0xfb, 0x45,
0x7b, 0x1e, 0x34, 0x4d, 0xd3, 0x34, 0x6d, 0x0d,
0x77, 0xa0, 0x6d, 0x65, 0x59, 0x96, 0x65, 0xb9,
0xc7, 0x81, 0xad, 0x0c, 0xe0, 0x5c, 0x41, 0x0c,
0xd6, 0x46, 0xdb, 0x42, 0x48, 0xc2, 0x30, 0x82,
0x24, 0xc1, 0x5d, 0x25, 0x32, 0x58, 0x09, 0xdd,
0xdf, 0x3f, 0x3c, 0xdc, 0xdd, 0x01, 0xec, 0xed,
0xb9, 0xee, 0xfe, 0x7e, 0x73, 0x50, 0x18, 0x86,
0x61, 0x18, 0xf6, 0x0d, 0xc3, 0x2c, 0xb0, 0x8d,
0xf6, 0xc5, 0xc2, 0x02, 0x1c, 0x67, 0x32, 0x71,
0x5d, 0x00, 0x9e, 0xe7, 0x79, 0x9e, 0x07, 0xc8,
0xf3, 0x3c, 0xcf, 0xf3, 0xd9, 0x12, 0xc2, 0x0c,
0xb4, 0x33, 0x81, 0x68, 0x97, 0x4c, 0x7b, 0xbf,
0x2c, 0xcb, 0xb2, 0x2c, 0x07, 0x10, 0x80, 0x44,
0xb2, 0x2c, 0xcb, 0xb2, 0xac, 0x59, 0x47, 0x51,
0x14, 0x45, 0xd1, 0x72, 0xd1, 0x07, 0x58, 0xc3,
0x20, 0x23, 0x61, 0x34, 0x1a, 0x8d, 0x46, 0xa3,
0xee, 0x01, 0xd6, 0x75, 0x57, 0x06, 0xcf, 0x40,
0x9b, 0x08, 0xe2, 0x6f, 0xef, 0x80, 0x6d, 0xdb,
0xb6, 0x6d, 0xaf, 0x71, 0x0e, 0x90, 0xa0, 0x28,
0x8a, 0xa2, 0x28, 0xb3, 0x91, 0x6d, 0x47, 0xb8,
0x6b, 0x8d, 0xed, 0x73, 0xb0, 0x36, 0x2a, 0x08,
0x82, 0x20, 0x08, 0xcb, 0xca, 0x5d, 0x3d, 0x88,
0x02, 0xea, 0x5a, 0x3c, 0x3f, 0xbf, 0xbe, 0xbe,
0xbd, 0xbd, 0xbc, 0x9c, 0x4e, 0x37, 0x45, 0xf0,
0xf5, 0xf5, 0xe5, 0xe5, 0xed, 0xed, 0xe0, 0x80,
0xe4, 0xef, 0xf9, 0xd7, 0x03, 0x67, 0xe8, 0xf6,
0x76, 0x6d, 0x77, 0x76, 0x7e, 0x5b, 0xdc, 0xdf,
0xda, 0xaa, 0x2d, 0xf6, 0x13, 0x6c, 0x9c, 0x58,
0x1c, 0xdf, 0xdf, 0xb5, 0xfd, 0xfa, 0xaa, 0xed,
0xfb, 0x7b, 0x6d, 0x3f, 0x3e, 0x6a, 0xfb, 0xf9,
0xf9, 0xdb, 0x8f, 0x3f, 0xef, 0xfa, 0x14, 0xd7,
0x3f, 0x82, 0x1f, 0x81, 0xd2, 0x60, 0x2a, 0xa4,
0x04, 0x28, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};

View File

@@ -1,10 +1,10 @@
dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl
dnl This macro was generated by
dnl Bakefile 0.2.8 (http://www.bakefile.org)
dnl Bakefile 0.2.9 (http://www.bakefile.org)
dnl Do not modify, all changes will be overwritten!
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.8"
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9"
dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ###
AC_BAKEFILE_PRECOMP_HEADERS
@@ -62,7 +62,7 @@ dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../samples/docvwmdi/docvw
COND_BUILD_RELEASE_UNICODE_1=""
fi
AC_SUBST(COND_BUILD_RELEASE_UNICODE_1)
dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_debug="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILD_debug=""
@@ -74,7 +74,7 @@ dnl ### begin block 20_COND_BUILD_debug_DEBUG_FLAG_default[../../samples/editlbo
COND_BUILD_debug_DEBUG_FLAG_default=""
fi
AC_SUBST(COND_BUILD_debug_DEBUG_FLAG_default)
dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_debug_DEBUG_INFO_default="#"
if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
COND_BUILD_debug_DEBUG_INFO_default=""
@@ -92,13 +92,13 @@ dnl ### begin block 20_COND_BUILD_debug_UNICODE_1[../../samples/editlbox/editlbo
COND_BUILD_debug_UNICODE_1=""
fi
AC_SUBST(COND_BUILD_debug_UNICODE_1)
dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_release="#"
if test "x$BUILD" = "xrelease" ; then
COND_BUILD_release=""
fi
AC_SUBST(COND_BUILD_release)
dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_release_DEBUG_INFO_default="#"
if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
COND_BUILD_release_DEBUG_INFO_default=""
@@ -116,7 +116,7 @@ dnl ### begin block 20_COND_BUILD_release_UNICODE_1[../../samples/editlbox/editl
COND_BUILD_release_UNICODE_1=""
fi
AC_SUBST(COND_BUILD_release_UNICODE_1)
dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEBUG_FLAG_0="#"
if test "x$DEBUG_FLAG" = "x0" ; then
COND_DEBUG_FLAG_0=""
@@ -128,25 +128,25 @@ dnl ### begin block 20_COND_DEBUG_FLAG_1[../../samples/docvwmdi/docvwmdi.bkl,../
COND_DEBUG_FLAG_1=""
fi
AC_SUBST(COND_DEBUG_FLAG_1)
dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEBUG_INFO_0="#"
if test "x$DEBUG_INFO" = "x0" ; then
COND_DEBUG_INFO_0=""
fi
AC_SUBST(COND_DEBUG_INFO_0)
dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEBUG_INFO_1="#"
if test "x$DEBUG_INFO" = "x1" ; then
COND_DEBUG_INFO_1=""
fi
AC_SUBST(COND_DEBUG_INFO_1)
dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEPS_TRACKING_0="#"
if test "x$DEPS_TRACKING" = "x0" ; then
COND_DEPS_TRACKING_0=""
fi
AC_SUBST(COND_DEPS_TRACKING_0)
dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEPS_TRACKING_1="#"
if test "x$DEPS_TRACKING" = "x1" ; then
COND_DEPS_TRACKING_1=""
@@ -164,7 +164,7 @@ dnl ### begin block 20_COND_ICC_PCH_1[../../tests/test.bkl,wx.bkl] ###
COND_ICC_PCH_1=""
fi
AC_SUBST(COND_ICC_PCH_1)
dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_0="#"
if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC_0=""
@@ -206,6 +206,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
@@ -236,7 +242,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_XRC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[wx.bkl] ###
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1=""
@@ -272,6 +278,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then
@@ -326,7 +338,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_HTML_1[wx.bkl] ###
COND_MONOLITHIC_0_USE_HTML_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_USE_HTML_1)
dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_0_USE_MEDIA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
COND_MONOLITHIC_0_USE_MEDIA_1=""
@@ -362,13 +374,19 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[wx.bkl] ###
COND_MONOLITHIC_0_USE_STC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_USE_STC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_0_USE_WEBVIEW_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then
COND_MONOLITHIC_0_USE_WEBVIEW_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_USE_WEBVIEW_1)
dnl ### begin block 20_COND_MONOLITHIC_0_USE_XRC_1[wx.bkl] ###
COND_MONOLITHIC_0_USE_XRC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then
COND_MONOLITHIC_0_USE_XRC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_USE_XRC_1)
dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_1="#"
if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC_1=""
@@ -386,13 +404,13 @@ dnl ### begin block 20_COND_MONOLITHIC_1_SHARED_1[wx.bkl] ###
COND_MONOLITHIC_1_SHARED_1=""
fi
AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
fi
AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
@@ -410,7 +428,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[wx.bkl] ###
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_MACOSX_1="#"
if test "x$PLATFORM_MACOSX" = "x1" ; then
COND_PLATFORM_MACOSX_1=""
@@ -482,19 +500,19 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[wx.bkl] ###
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_MACOS_1="#"
if test "x$PLATFORM_MACOS" = "x1" ; then
COND_PLATFORM_MACOS_1=""
fi
AC_SUBST(COND_PLATFORM_MACOS_1)
dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
dnl ### begin block 20_COND_PLATFORM_MAC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
COND_PLATFORM_MAC_0="#"
if test "x$PLATFORM_MAC" = "x0" ; then
COND_PLATFORM_MAC_0=""
fi
AC_SUBST(COND_PLATFORM_MAC_0)
dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
dnl ### begin block 20_COND_PLATFORM_MAC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
COND_PLATFORM_MAC_1="#"
if test "x$PLATFORM_MAC" = "x1" ; then
COND_PLATFORM_MAC_1=""
@@ -506,42 +524,54 @@ dnl ### begin block 20_COND_PLATFORM_MSDOS_0[../../samples/dialup/dialup.bkl] ##
COND_PLATFORM_MSDOS_0=""
fi
AC_SUBST(COND_PLATFORM_MSDOS_0)
dnl ### begin block 20_COND_PLATFORM_MSDOS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_PLATFORM_MSDOS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_MSDOS_1="#"
if test "x$PLATFORM_MSDOS" = "x1" ; then
COND_PLATFORM_MSDOS_1=""
fi
AC_SUBST(COND_PLATFORM_MSDOS_1)
dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_OS2_1="#"
if test "x$PLATFORM_OS2" = "x1" ; then
COND_PLATFORM_OS2_1=""
fi
AC_SUBST(COND_PLATFORM_OS2_1)
dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_UNIX_0="#"
if test "x$PLATFORM_UNIX" = "x0" ; then
COND_PLATFORM_UNIX_0=""
fi
AC_SUBST(COND_PLATFORM_UNIX_0)
dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_UNIX_1="#"
if test "x$PLATFORM_UNIX" = "x1" ; then
COND_PLATFORM_UNIX_1=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL[wx.bkl] ###
COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1)
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_UNIX_1_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
@@ -554,13 +584,13 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_PLUGINS_0[wx.bkl] ###
COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN32_0=""
fi
AC_SUBST(COND_PLATFORM_WIN32_0)
dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_WIN32_1="#"
if test "x$PLATFORM_WIN32" = "x1" ; then
COND_PLATFORM_WIN32_1=""
@@ -644,7 +674,7 @@ dnl ### begin block 20_COND_SHARED_0_wxUSE_ZLIB_builtin[wx.bkl] ###
COND_SHARED_0_wxUSE_ZLIB_builtin=""
fi
AC_SUBST(COND_SHARED_0_wxUSE_ZLIB_builtin)
dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_SHARED_1="#"
if test "x$SHARED" = "x1" ; then
COND_SHARED_1=""
@@ -662,7 +692,7 @@ dnl ### begin block 20_COND_TOOLKIT_[wx.bkl] ###
COND_TOOLKIT_=""
fi
AC_SUBST(COND_TOOLKIT_)
dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
dnl ### begin block 20_COND_TOOLKIT_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
COND_TOOLKIT_COCOA="#"
if test "x$TOOLKIT" = "xCOCOA" ; then
COND_TOOLKIT_COCOA=""
@@ -722,6 +752,36 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0[wx.
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3[wx.bkl] ###
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
fi
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3)
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
@@ -740,24 +800,12 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_GTK_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_TOOLKIT_MAC="#"
if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKIT_MAC=""
fi
AC_SUBST(COND_TOOLKIT_MAC)
dnl ### begin block 20_COND_TOOLKIT_MGL[wx.bkl] ###
COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL=""
fi
AC_SUBST(COND_TOOLKIT_MGL)
dnl ### begin block 20_COND_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_MGL_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MGL_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_MOTIF[wx.bkl] ###
COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then
@@ -776,7 +824,7 @@ dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKIT_MSW=""
@@ -800,7 +848,7 @@ dnl ### begin block 20_COND_TOOLKIT_MSW_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MSW_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
COND_TOOLKIT_OSX_CARBON="#"
if test "x$TOOLKIT" = "xOSX_CARBON" ; then
COND_TOOLKIT_OSX_CARBON=""
@@ -812,7 +860,7 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_CARBON_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_OSX_CARBON_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
COND_TOOLKIT_OSX_COCOA="#"
if test "x$TOOLKIT" = "xOSX_COCOA" ; then
COND_TOOLKIT_OSX_COCOA=""
@@ -824,7 +872,7 @@ dnl ### begin block 20_COND_TOOLKIT_OSX_COCOA_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_OSX_COCOA_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
dnl ### begin block 20_COND_TOOLKIT_OSX_IPHONE[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,wx.bkl] ###
COND_TOOLKIT_OSX_IPHONE="#"
if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
COND_TOOLKIT_OSX_IPHONE=""
@@ -896,37 +944,37 @@ dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_X11_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)
dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1=""
fi
AC_SUBST(COND_UNICODE_1)
dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_CAIRO_1="#"
if test "x$USE_CAIRO" = "x1" ; then
COND_USE_CAIRO_1=""
fi
AC_SUBST(COND_USE_CAIRO_1)
dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_EXCEPTIONS_0="#"
if test "x$USE_EXCEPTIONS" = "x0" ; then
COND_USE_EXCEPTIONS_0=""
fi
AC_SUBST(COND_USE_EXCEPTIONS_0)
dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_EXCEPTIONS_1="#"
if test "x$USE_EXCEPTIONS" = "x1" ; then
COND_USE_EXCEPTIONS_1=""
fi
AC_SUBST(COND_USE_EXCEPTIONS_1)
dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_0="#"
if test "x$USE_GUI" = "x0" ; then
COND_USE_GUI_0=""
fi
AC_SUBST(COND_USE_GUI_0)
dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_1="#"
if test "x$USE_GUI" = "x1" ; then
COND_USE_GUI_1=""
@@ -968,19 +1016,19 @@ dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[../../samples/docvwm
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
fi
AC_SUBST(COND_USE_GUI_1_wxUSE_LIBJPEG_builtin)
dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
fi
AC_SUBST(COND_USE_GUI_1_wxUSE_LIBPNG_builtin)
dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
@@ -998,19 +1046,19 @@ dnl ### begin block 20_COND_USE_PCH_1[../../tests/test.bkl,wx.bkl] ###
COND_USE_PCH_1=""
fi
AC_SUBST(COND_USE_PCH_1)
dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_PLUGINS_0="#"
if test "x$USE_PLUGINS" = "x0" ; then
COND_USE_PLUGINS_0=""
fi
AC_SUBST(COND_USE_PLUGINS_0)
dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_RTTI_0="#"
if test "x$USE_RTTI" = "x0" ; then
COND_USE_RTTI_0=""
fi
AC_SUBST(COND_USE_RTTI_0)
dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_RTTI_1="#"
if test "x$USE_RTTI" = "x1" ; then
COND_USE_RTTI_1=""
@@ -1058,13 +1106,13 @@ dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
COND_USE_STC_1=""
fi
AC_SUBST(COND_USE_STC_1)
dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_THREADS_0="#"
if test "x$USE_THREADS" = "x0" ; then
COND_USE_THREADS_0=""
fi
AC_SUBST(COND_USE_THREADS_0)
dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_THREADS_1="#"
if test "x$USE_THREADS" = "x1" ; then
COND_USE_THREADS_1=""
@@ -1094,7 +1142,7 @@ dnl ### begin block 20_COND_WXUNIV_0[wx.bkl] ###
COND_WXUNIV_0=""
fi
AC_SUBST(COND_WXUNIV_0)
dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=""
@@ -1136,37 +1184,37 @@ dnl ### begin block 20_COND_WXUSE_ZLIB_BUILTIN[../../samples/docvwmdi/docvwmdi.b
COND_WXUSE_ZLIB_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_wxUSE_EXPAT_builtin="#"
if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_wxUSE_EXPAT_builtin=""
fi
AC_SUBST(COND_wxUSE_EXPAT_builtin)
dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_wxUSE_LIBJPEG_builtin="#"
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_wxUSE_LIBJPEG_builtin=""
fi
AC_SUBST(COND_wxUSE_LIBJPEG_builtin)
dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_wxUSE_LIBPNG_builtin="#"
if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_wxUSE_LIBPNG_builtin=""
fi
AC_SUBST(COND_wxUSE_LIBPNG_builtin)
dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_wxUSE_LIBTIFF_builtin="#"
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_wxUSE_LIBTIFF_builtin=""
fi
AC_SUBST(COND_wxUSE_LIBTIFF_builtin)
dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_wxUSE_REGEX_builtin="#"
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_wxUSE_REGEX_builtin=""
fi
AC_SUBST(COND_wxUSE_REGEX_builtin)
dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_wxUSE_ZLIB_builtin="#"
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
COND_wxUSE_ZLIB_builtin=""

View File

@@ -3,7 +3,7 @@ dnl
dnl Provides a test to determine the correct way to call
dnl getservbyname_r:
dnl
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g. linux)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1)
dnl

View File

@@ -45,13 +45,15 @@ ac_cv_func_which_gethostbyname_r=unknown
# assuming an implicit prototype. In which case, we're out of luck.
#
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
(void)gethostbyname_r(name) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=no)
[AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
(void)gethostbyname_r(name) /* ; */
]]
)],
ac_cv_func_which_gethostbyname_r=no
)
#
# SIX ARGUMENTS
@@ -61,17 +63,19 @@ AC_COMPILE_IFELSE(
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret, *retp;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=six)
[AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret, *retp;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
]]
)],
ac_cv_func_which_gethostbyname_r=six
)
fi
@@ -83,17 +87,19 @@ fi
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=five)
[[
char *name = "www.gnu.org";
struct hostent ret;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
]]
)],
ac_cv_func_which_gethostbyname_r=five
)
fi
@@ -105,15 +111,17 @@ fi
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret;
struct hostent_data data;
(void)gethostbyname_r(name, &ret, &data) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=three)
[AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret;
struct hostent_data data;
(void)gethostbyname_r(name, &ret, &data) /* ; */
]]
)],
ac_cv_func_which_gethostbyname_r=three
)
fi

View File

@@ -21,7 +21,7 @@ dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
dnl DEALINGS IN THE SOFTWARE.
dnl
dnl $Id: bakefile-lang.m4 1278 2008-11-17 22:26:10Z vadz $
dnl $Id$
dnl
dnl Compiler detection macros by David Elliott and Vadim Zeitlin
dnl

View File

@@ -558,16 +558,7 @@ AC_DEFUN([AC_BAKEFILE_DEPS],
if test "x$GCC" = "xyes"; then
DEPSMODE=gcc
case "${BAKEFILE_HOST}" in
*-*-darwin* )
dnl -cpp-precomp (the default) conflicts with -MMD option
dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html)
DEPSFLAG="-no-cpp-precomp -MMD"
;;
* )
DEPSFLAG="-MMD"
;;
esac
DEPSFLAG="-MMD"
AC_MSG_RESULT([gcc])
elif test "x$MWCC" = "xyes"; then
DEPSMODE=mwcc
@@ -644,21 +635,8 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
AC_CHECK_TOOL(STRIP, strip, :)
AC_CHECK_TOOL(NM, nm, :)
dnl This check is necessary because "install -d" doesn't exist on
dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80
AC_MSG_CHECKING([for command to install directories])
INSTALL_TEST_DIR=acbftest$$
$INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
if test $? = 0 -a -d $INSTALL_TEST_DIR; then
rmdir $INSTALL_TEST_DIR
dnl we must refer to makefile's $(INSTALL) variable and not
dnl current value of shell variable, hence the single quoting:
INSTALL_DIR='$(INSTALL) -d'
AC_MSG_RESULT([$INSTALL -d])
else
INSTALL_DIR="mkdir -p"
AC_MSG_RESULT([mkdir -p])
fi
dnl Don't use `install -d`, see http://trac.wxwidgets.org/ticket/13452
INSTALL_DIR="mkdir -p"
AC_SUBST(INSTALL_DIR)
LDFLAGS_GUI=
@@ -837,7 +815,7 @@ AC_DEFUN([AC_BAKEFILE],
AC_SUBST(OBJCXXFLAGS)
BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
dnl includes autoconf_inc.m4:
$1

View File

@@ -103,7 +103,7 @@ main ()
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
@@ -139,7 +139,7 @@ main ()
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
@@ -181,7 +181,7 @@ main ()
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi

219
build/aclocal/gtk-3.0.m4 Normal file
View File

@@ -0,0 +1,219 @@
# Configure paths for GTK+
# Owen Taylor 1997-2001
dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl pass to pkg-config
dnl
AC_DEFUN([AM_PATH_GTK_3_0],
[dnl
dnl Get the cflags and libraries from pkg-config
dnl
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
, enable_gtktest=yes)
pkg_config_args=gtk+-3.0
for module in . $4
do
case "$module" in
gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
esac
done
no_gtk=""
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test x$PKG_CONFIG != xno ; then
if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
:
else
echo "*** pkg-config too old; version 0.7 or better required."
no_gtk=yes
PKG_CONFIG=no
fi
else
no_gtk=yes
fi
min_gtk_version=ifelse([$1], ,3.0.0,$1)
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
if test x$PKG_CONFIG != xno ; then
## don't try to run the test against uninstalled libtool libs
if $PKG_CONFIG --uninstalled $pkg_config_args; then
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
enable_gtktest=no
fi
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
:
else
no_gtk=yes
fi
fi
if test x"$no_gtk" = x ; then
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-3.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
dnl
dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
dnl checks the results of pkg-config to some extent)
dnl
rm -f conf.gtktest
AC_TRY_RUN([
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
fclose (fopen ("conf.gtktest", "w"));
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_gtk_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
if ((gtk_major_version != $gtk_config_major_version) ||
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
printf("*** to point to the correct configuration files\n");
}
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(gtk_minor_version != GTK_MINOR_VERSION) ||
(gtk_micro_version != GTK_MICRO_VERSION))
{
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
}
else
{
if ((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
echo "*** See http://pkgconfig.sourceforge.net"
else
if test -f conf.gtktest ; then
:
else
echo "*** Could not run GTK+ test program, checking why..."
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([
#include <gtk/gtk.h>
#include <stdio.h>
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GTK_CFLAGS=""
GTK_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
rm -f conf.gtktest
])
dnl GTK_CHECK_BACKEND(BACKEND-NAME [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Tests for BACKEND-NAME in the GTK targets list
dnl
AC_DEFUN([GTK_CHECK_BACKEND],
[
pkg_config_args=ifelse([$1],,gtk+-3.0, gtk+-$1-3.0)
min_gtk_version=ifelse([$2],,3.0.0,$2)
AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])])
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args ; then
target_found=yes
else
target_found=no
fi
if test "x$target_found" = "xno"; then
ifelse([$4],,[AC_MSG_ERROR([Backend $backend not found.])],[$4])
else
ifelse([$3],,[:],[$3])
fi
])

View File

@@ -91,7 +91,7 @@ main ()
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If gtk-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
@@ -130,7 +130,7 @@ main ()
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
printf("*** correct copy of gtk-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
@@ -177,7 +177,7 @@ main ()
echo "***"
echo "*** rpm --erase --nodeps gtk gtk-devel" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
echo "*** exact error that occurred. This usually means GTK was incorrectly installed"
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"

View File

@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** exact error that occurred. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"

View File

@@ -49,6 +49,11 @@ AC_DEFUN([WX_VISIBILITY],
error this platform has no visibility;
#endif
/* at the time of Xcode 4.1 / Clang 3, Clang++ still didn't have the bugs sorted out: */
#if defined(__clang__)
clang compiler is still broken w.r.t. visibility;
#endif
extern __attribute__((__visibility__("hidden"))) int hiddenvar;
extern __attribute__((__visibility__("default"))) int exportedvar;
extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);

View File

@@ -9,7 +9,7 @@
Bakefiles.local.bkgen file in this directory and add <enable-formats>
into it:
<?xml version="1.0" ?>
<bakefile-gen>
<bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
<enable-formats>dmars</enable-formats>
</bakefile-gen>
@@ -62,12 +62,14 @@
<!-- WinCE can't have console apps: -->
<del-formats files="../../samples/console/*">msevc4prj</del-formats>
<del-formats files="../../samples/sockets/*">msevc4prj</del-formats>
<del-formats files="../../utils/execmon/*">msevc4prj</del-formats>
<del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
<del-formats files="../../utils/ifacecheck/src/*">msevc4prj</del-formats>
<del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
<del-formats files="../../tests/*">msevc4prj</del-formats>
<del-formats files="../../tests/benchmarks/*">msevc4prj</del-formats>
<!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
<del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom

View File

@@ -8,8 +8,7 @@
the library.
-->
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'] and
TOOLKIT in ['PM','MSW','MGL','MOTIF']">
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
<set var="BUILD_CFG_FILE" make_var="1">
$(SETUPHDIR)$(DIRSEP)build.cfg
@@ -39,10 +38,12 @@
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
@echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
@echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)
@echo CC=$(CC) >>$(BUILD_CFG_FILE)
@echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
@echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)

View File

@@ -22,10 +22,6 @@
<set var="PLATFORM_MACOS">0</set>
</if>
<!-- FIXME: PalmOS is another candidate to bakefiles -->
<set var="PLATFORM_PALMOS">0</set>
<include file="config.bkl"/>
<include file="plugins_deps.bkl"/>
@@ -34,6 +30,15 @@
<!-- wxWidgets version numbers logic: -->
<include file="version.bkl"/>
<set var="ARCH_SUFFIX">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
<if cond="TARGET_CPU=='amd64'">_x64</if>
<if cond="TARGET_CPU=='AMD64'">_x64</if>
<if cond="TARGET_CPU=='ia64'">_ia64</if>
<if cond="TARGET_CPU=='IA64'">_ia64</if>
<if cond="TARGET_CPU=='x64'">_x64</if>
<if cond="TARGET_CPU=='X64'">_x64</if>
</set>
<!-- ================================================================== -->
<!-- Names of libraries and DLLs: -->
@@ -48,12 +53,26 @@
<if cond="TOOLKIT=='MAC'">_carbon</if>
</set>
<!--
Optional compiler version, mainly for Windows compilers for which it is
supposed to be set on make command line for the official builds.
-->
<set var="COMPILER_VERSION" make_var="1">
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD</if>
</set>
<set var="COMPILERORGCC">
<if cond="isdefined('COMPILER')">$(COMPILER)</if>
<if cond="not isdefined('COMPILER')">gcc</if>
</set>
<!--
In the official builds we use not only the compiler name but also its
version and architecture we compile for in the libraries names.
-->
<set var="WXCOMPILER">
<if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'">_$(COMPILERORGCC)$(COMPILER_VERSION)$(ARCH_SUFFIX)</if>
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(COMPILERORGCC)</if>
</set>
<set var="VENDORTAG">
@@ -161,7 +180,9 @@
<set var="WXLIB_STC">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
</set>
<set var="WXLIB_WEBVIEW">
<if cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
</set>
@@ -171,14 +192,6 @@
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
<set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
<if cond="TARGET_CPU=='amd64'">_amd64</if>
<if cond="TARGET_CPU=='AMD64'">_amd64</if>
<if cond="TARGET_CPU=='ia64'">_ia64</if>
<if cond="TARGET_CPU=='IA64'">_ia64</if>
</set>
<if cond="FORMAT!='autoconf'">
<set var="WXDLLFLAG">
<if cond="SHARED=='1'">dll</if>
@@ -187,12 +200,12 @@
$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG)
</set>
<!-- NB: this is make_var so that it can be overriden on command line
<!-- NB: this is make_var so that it can be overridden on command line
like this: nmake -f makefile.vc COMPILER_PREFIX=vc6 -->
<set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
<set var="OBJS" make_var="1">
$(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX)
</set>
<set var="BUILDDIR">$(OBJS)</set>
@@ -208,7 +221,7 @@
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(wx_top_builddir)/lib</if>
<if cond="FORMAT!='autoconf'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
</if>
</set>
@@ -307,6 +320,8 @@
<if cond="TARGET_CPU=='AMD64'">/MACHINE:X64</if>
<if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
<if cond="TARGET_CPU=='x64'">/MACHINE:X64</if>
<if cond="TARGET_CPU=='X64'">/MACHINE:X64</if>
</set>
<template id="common_settings">
@@ -320,6 +335,13 @@
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
<!-- Suppress deprecation warnings for standard library calls -->
<if cond="FORMAT in ['msvc','msvs2005prj','msvs2008prj']">
<define>_CRT_SECURE_NO_DEPRECATE=1</define>
<define>_CRT_NON_CONFORMING_SWPRINTFS=1</define>
<define>_SCL_SECURE_NO_WARNINGS=1</define>
</if>
<define>$(NO_VC_CRTDBG)</define>
<define>$(WIN32_WINNT)</define>
<if cond="FORMAT=='msvc'">
@@ -376,7 +398,14 @@
</define-tag>
<set var="msvc_copy_setup_h_script">
<if cond="IS_MSVC_PRJ">
<if cond="IS_MSVC_PRJ=='1' and FORMAT not in ['msvc6prj','msevc4prj']">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\..\include\wx\%s
"$(SETUPHDIR)\wx\setup.h" :
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</if>
<if cond="IS_MSVC_PRJ=='1' and FORMAT in ['msvc6prj','msevc4prj']">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\..\include\wx\%s
@@ -412,7 +441,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
univ/setup.h
</msvc-headers-setup-h>
<set var="_custom_build_include_wx_msw_setup_h">
<if cond="WXUNIV=='0'">
<if cond="WXUNIV=='0' and TOOLKIT=='MSW'">
$(msvc_copy_setup_h_script % 'msw\setup.h')
</if>
</set>
@@ -473,7 +502,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
The variables below are defined so that all libs are used
in monolithic build, but not in multilib one. -->
<set var="EXTRALIBS_FOR_BASE">
<if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_GUI)</if>
<if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_XML) $(EXTRALIBS_GUI)</if>
<if cond="MONOLITHIC=='0'">$(EXTRALIBS)</if>
</set>
<set var="EXTRALIBS_FOR_GUI">
@@ -481,13 +510,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
</set>
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
<set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
<set var="MGLPMLIBPATH">
<if cond="DOS32=='DOS4GW'">dos4gw</if>
</set>
</if>
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
@@ -503,10 +525,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
<lib-path>$(MGLLIBPATH)</lib-path>
<lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
</if>
<warnings>max</warnings>
<cxxflags cond="FORMAT=='autoconf'">$(CXXWARNINGS)</cxxflags>
@@ -537,13 +555,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
</if>
</if>
<!-- system libraries on mgl: -->
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
<sys-lib>mgl</sys-lib>
<sys-lib>mglcpp</sys-lib>
<sys-lib>pm</sys-lib>
</if>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
@@ -594,10 +605,16 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
<set var="LIB_PNG_IF_MONO">
<if cond="MONOLITHIC=='1'">$(LIB_PNG)</if>
</set>
<template id="wx_append_base" template_append="wx_append_base_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<!-- Always link against the full wx library in monolithic build and
also against the PNG one as core code references it for Tango
icons and so it is pulled in even by the console programs. -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
<sys-lib>$(LIB_PNG_IF_MONO)</sys-lib>
</template>
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
@@ -614,7 +631,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<define>WXBUILDING</define>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL','PM','WINCE']">
<if cond="FORMAT!='autoconf'">
<sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/common/dummy.cpp
@@ -626,6 +643,8 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<precomp-headers-file>wxprec_$(id)</precomp-headers-file>
<precomp-headers-exclude>
src/common/extended.c
src/gtk/eggtrayicon.c
src/gtk/treeentry_gtk.c
</precomp-headers-exclude>
</if>
@@ -687,9 +706,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
</template>
<template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
<include>$(DOLLAR)(%SCITECH)/include</include>
</if>
<include>$(INC_TIFF_BUILD)</include>
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>

View File

@@ -103,7 +103,8 @@ your environment is set up appropriately with the correct compiler in the
PATH. Rather it affects some options passed to some of the common build
utilities such as the resource compiler and the linker.
Accepted values: AMD64, IA64.
Accepted values: IA64, X64
(AMD64 accepted as synonym for X64 but should not be used any more).
</description>
</option>
</if>
@@ -200,6 +201,14 @@ Default is to use debug CRT if and only if BUILD==debug.
</description>
</option>
<option name="USE_WEBVIEW">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxWebView library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_MEDIA">
<values>0,1</values>
<default-value>1</default-value>
@@ -388,7 +397,7 @@ to run the tests, include CppUnit library here.
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
<set var="RUNTIME_LIBS">dynamic</set>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->
<option name="WITH_PLUGIN_SDL">
<values>0,1</values>
@@ -413,7 +422,7 @@ it if SHARED=1 unless you know what you are doing.
</description>
</option>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="WXTOPDIR"/> <!-- to be overridden on bakefile cmd line -->
<set var="TOOLKIT" overwrite="0">
<if cond="FORMAT=='msevc4prj'">WINCE</if>
@@ -422,7 +431,6 @@ it if SHARED=1 unless you know what you are doing.
<if cond="FORMAT=='msvs2005prj' and MSVS_PLATFORMS=='win32'">MSW</if>
<if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORMS=='win32'">MSW</if>
<if cond="FORMAT not in ['msevc4prj','msvs2005prj','msvs2008prj'] and PLATFORM_WIN32=='1'">MSW</if>
<if cond="PLATFORM_MSDOS=='1'">MGL</if>
<if cond="PLATFORM_OS2=='1'">PM</if>
</set>
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
@@ -480,6 +488,7 @@ Set the version of your Mingw installation here.
<set var="USE_RICHTEXT">1</set>
<set var="USE_STC">1</set>
<set var="USE_HTML">1</set>
<set var="USE_WEBVIEW">1</set>
<set var="USE_MEDIA">1</set>
<set var="USE_XRC">1</set>
<set var="USE_OPENGL">1</set>
@@ -523,11 +532,4 @@ Set the version of your Mingw installation here.
</if>
</if>
<!-- Need for wxUniv within wxMGL: -->
<if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
<set var="WXUNIV">1</set>
<set var="USE_THREADS">0</set>
<set var="RUNTIME_LIBS">static</set>
</if>
</makefile>

File diff suppressed because it is too large Load Diff

View File

@@ -59,7 +59,7 @@
$(BUNDLE_PLIST) >$(BUNDLE)/Info.plist
<!-- PkgInfo: -->
echo -n "APPL????" >$(BUNDLE)/PkgInfo
/bin/echo "APPL????" >$(BUNDLE)/PkgInfo
<!-- move the binary: -->
ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)

View File

@@ -29,7 +29,6 @@ GTKDIR = $(WXDIR)/src/gtk
GTK1DIR = $(WXDIR)/src/gtk1
X11DIR = $(WXDIR)/src/x11
X11INC = $(WXDIR)/include/wx/x11
MGLDIR = $(WXDIR)/src/mgl
MOTIFDIR = $(WXDIR)/src/motif
MSDOSDIR = $(WXDIR)/src/msdos
MSWDIR = $(WXDIR)/src/msw
@@ -138,6 +137,7 @@ ALL_DIST: distrib_clean
mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets
$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/wx_presets.py $(DISTDIR)/build/bakefiles/wxpresets/presets
mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample
$(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample
@@ -163,10 +163,12 @@ ALL_GUI_DIST: ALL_DIST
fi
mkdir $(DISTDIR)/include/wx/meta
mkdir $(DISTDIR)/include/wx/generic
mkdir $(DISTDIR)/include/wx/generic/private
mkdir $(DISTDIR)/include/wx/html
mkdir $(DISTDIR)/include/wx/richtext
mkdir $(DISTDIR)/include/wx/aui
mkdir $(DISTDIR)/include/wx/ribbon
mkdir $(DISTDIR)/include/wx/persist
mkdir $(DISTDIR)/include/wx/propgrid
mkdir $(DISTDIR)/include/wx/stc
mkdir $(DISTDIR)/include/wx/protocol
@@ -178,17 +180,19 @@ ALL_GUI_DIST: ALL_DIST
$(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
$(CP_P) $(INCDIR)/wx/meta/*.h $(DISTDIR)/include/wx/meta
$(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
$(CP_P) $(INCDIR)/wx/generic/private/*.h $(DISTDIR)/include/wx/generic/private
$(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
$(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
$(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
$(CP_P) $(INCDIR)/wx/ribbon/*.h $(DISTDIR)/include/wx/ribbon
$(CP_P) $(INCDIR)/wx/persist/*.h $(DISTDIR)/include/wx/persist
$(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid
$(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
$(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
$(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
$(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private
$(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
$(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
$(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
mkdir $(DISTDIR)/art
mkdir $(DISTDIR)/art/gtk
@@ -222,7 +226,7 @@ ALL_GUI_DIST: ALL_DIST
mkdir $(DISTDIR)/src/aui
$(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
mkdir $(DISTDIR)/src/ribbon
$(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon
@@ -291,13 +295,13 @@ BASE_DIST: ALL_DIST INTL_DIST
mkdir $(DISTDIR)/include/wx/richtext
mkdir $(DISTDIR)/include/wx/aui
mkdir $(DISTDIR)/include/wx/ribbon
mkdir $(DISTDIR)/include/wx/persist
mkdir $(DISTDIR)/include/wx/propgrid
mkdir $(DISTDIR)/include/wx/stc
mkdir $(DISTDIR)/include/wx/osx
mkdir $(DISTDIR)/include/wx/osx/carbon
mkdir $(DISTDIR)/include/wx/osx/core
mkdir $(DISTDIR)/include/wx/os2
mkdir $(DISTDIR)/include/wx/palmos
mkdir $(DISTDIR)/src/unix
mkdir $(DISTDIR)/src/osx
mkdir $(DISTDIR)/src/osx/core
@@ -305,7 +309,6 @@ BASE_DIST: ALL_DIST INTL_DIST
mkdir $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/src/msw
mkdir $(DISTDIR)/src/os2
mkdir $(DISTDIR)/src/palmos
$(CP_P) $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
$(CP_P) $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
list='$(ALL_PORTS_BASE_HEADERS)'; for p in $$list; do \
@@ -347,6 +350,8 @@ GTK_DIST: UNIV_DIST
$(CP_P) $(GTK1DIR)/*.c $(DISTDIR)/src/gtk1
$(CP_P) $(GTK1DIR)/*.xbm $(DISTDIR)/src/gtk1
$(CP_P) $(GTK1DIR)/*.mms $(DISTDIR)/src/gtk1
mkdir $(DISTDIR)/include/wx/x11/private
$(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
mkdir $(DISTDIR)/include/wx/gtk/gnome
mkdir $(DISTDIR)/src/gtk/gnome
@@ -368,6 +373,8 @@ GTK_DIST: UNIV_DIST
X11_DIST: UNIV_DIST
$(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
mkdir $(DISTDIR)/include/wx/x11/private
$(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
mkdir $(DISTDIR)/include/wx/gtk/private
$(CP_P) $(INCDIR)/wx/gtk/private/string.h $(DISTDIR)/include/wx/gtk/private
$(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
@@ -397,6 +404,8 @@ MOTIF_DIST: ALL_GUI_DIST
$(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
$(DISTDIR)/include/wx/x11
mkdir $(DISTDIR)/include/wx/x11/private
$(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
OSX_CARBON_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
@@ -493,16 +502,6 @@ UNIV_DIST: ALL_GUI_DIST
$(CP_P) $(SRCDIR)/univ/*.cpp $(DISTDIR)/src/univ
$(CP_P) $(SRCDIR)/univ/themes/*.cpp $(DISTDIR)/src/univ/themes
MGL_DIST: UNIV_DIST
$(CP_P) $(WXDIR)/wxMGL.spec $(DISTDIR)
$(CP_P) $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
mkdir $(DISTDIR)/include/wx/msdos
$(CP_P) $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
$(CP_P) $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
mkdir $(DISTDIR)/src/msdos
$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
DEMOS_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/demos
$(CP_P) $(DEMODIR)/Makefile.in $(DISTDIR)/demos
@@ -568,9 +567,12 @@ SAMPLES_DIST: ALL_GUI_DIST
$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
# copy files common to all samples in a general way
# copy files common to all samples in a general way (samples without
# Makefile.in in them are Windows-specific and shouldn't be included in
# Unix distribution)
for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
-mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
if [ ! -f $$s/Makefile.in ]; then continue; fi; \
t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
mkdir -p $$t; \
$(CP_P) $$s/Makefile.in \
@@ -591,8 +593,6 @@ SAMPLES_DIST: ALL_GUI_DIST
$(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/animate
$(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate
$(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
$(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
$(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd
@@ -648,7 +648,6 @@ SAMPLES_DIST: ALL_GUI_DIST
$(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc
$(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc
$(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc
$(CP_P) $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc
UTILS_DIST: ALL_GUI_DIST
mkdir $(DISTDIR)/utils
@@ -712,7 +711,6 @@ INTL_DIST:
mkdir $(DISTDIR)/locale
$(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale
$(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale
-$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale
subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
for dir in "$$subdirs"; do \
mkdir $(DISTDIR)/locale/$$dir; \
@@ -747,6 +745,7 @@ MANUAL_DIST:
mkdir $(DISTDIR)/interface/wx/html
mkdir $(DISTDIR)/interface/wx/msw
mkdir $(DISTDIR)/interface/wx/msw/ole
mkdir $(DISTDIR)/interface/wx/persist
mkdir $(DISTDIR)/interface/wx/protocol
mkdir $(DISTDIR)/interface/wx/propgrid
mkdir $(DISTDIR)/interface/wx/richtext
@@ -760,6 +759,7 @@ MANUAL_DIST:
$(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html
$(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw
$(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole
$(CP_P) $(IFACEDIR)/wx/persist/*.h $(DISTDIR)/interface/wx/persist
$(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol
$(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid
$(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext
@@ -926,5 +926,5 @@ rpm: bzip-dist
-mkdir $(RPMTOP)/RPMS
-mkdir $(RPMTOP)/SRPMS
cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` .
rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
mv -f `find $(RPMTOP) -name "wx-*.rpm"` .

View File

@@ -4,48 +4,37 @@
<set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'">
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(QA_SRC)
$(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC) $(RICHTEXT_SRC)
$(STC_SRC)
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC)
$(QA_SRC) $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC)
$(RICHTEXT_SRC) $(STC_SRC)
</if>
</set>
<set var="MONOLIB_SRC">
$(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
</set>
<dll id="monodll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='1'">
<!-- settings common to mono{dll,lib} below -->
<template id="wx_monolib_or_dll" template="wxscintilla_cppflags">
<define>wxUSE_BASE=1</define>
<define>WXMAKINGDLL</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</template>
<dll id="monodll" template="wx_dll,wx_monolib_or_dll"
cond="SHARED=='1' and MONOLITHIC=='1'">
<define>WXMAKINGDLL</define>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
<!-- STC stuff, should this be conditionalized? -->
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
<define>__WX__</define>
<define>SCI_LEXER</define>
<define>LINK_LEXERS</define>
<library>$(wxscintilla_library_link)</library>
</dll>
<lib id="monolib" template="wx_lib"
<lib id="monolib" template="wx_lib,wx_monolib_or_dll"
cond="SHARED=='0' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
<if cond="FORMAT=='watcom'">
<set var="LIB_PAGESIZE" overwrite="1">8192</set>
</if>
<!-- STC stuff, should this be conditionalized? -->
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
<define>__WX__</define>
<define>SCI_LEXER</define>
<define>LINK_LEXERS</define>
</lib>

View File

@@ -173,6 +173,30 @@
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ -->
<!-- wxWEBVIEW -->
<!-- ================================================================ -->
<dll id="webviewdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_WEBVIEW</define>
<sources>$(WEBVIEW_SRC)</sources>
<library>coredll</library>
<library>basedll</library>
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
</dll>
<lib id="webviewlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<sources>$(WEBVIEW_SRC)</sources>
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
</lib>
<wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
<!-- ================================================================ -->
<!-- OpenGL -->
<!-- ================================================================ -->
@@ -364,13 +388,7 @@
<!-- STC -->
<!-- ================================================================ -->
<template id="stc_base">
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
<define>__WX__</define>
<define>SCI_LEXER</define>
<define>LINK_LEXERS</define>
<cppflags-borland>-w-8027</cppflags-borland>
<template id="stc_base" template="wxscintilla_cppflags">
<library>wxscintilla</library>
</template>

View File

@@ -30,7 +30,6 @@
<sources>
src/png/png.c
src/png/pngerror.c
src/png/pnggccrd.c
src/png/pngget.c
src/png/pngmem.c
src/png/pngpread.c
@@ -40,7 +39,6 @@
src/png/pngrutil.c
src/png/pngset.c
src/png/pngtrans.c
src/png/pngvcrd.c
src/png/pngwio.c
src/png/pngwrite.c
src/png/pngwtran.c

View File

@@ -29,19 +29,30 @@
</fragment>
</if>
<lib id="wxscintilla" template="3rdparty_lib"
cond="USE_STC=='1' and BUILDING_LIB=='1'">
<template id="wxscintilla_cppflags">
<include>$(TOP_SRCDIR)src/stc/scintilla/include</include>
<include>$(TOP_SRCDIR)src/stc/scintilla/src</include>
<if cond="FORMAT!='autoconf'">
<include>$(SETUPHDIR)</include>
<include>$(TOP_SRCDIR)include</include>
</if>
<define>WXUSINGDLL</define>
<define>__WX__</define>
<define>__WX$(TOOLKIT)__</define>
<define>SCI_LEXER</define>
<define>LINK_LEXERS</define>
<cppflags-borland>-w-8027</cppflags-borland>
</template>
<set var="wxscintilla_usingdll">
<if cond="SHARED=='1' and MONOLITHIC=='0'">WXUSINGDLL</if>
</set>
<lib id="wxscintilla" template="3rdparty_lib,wxscintilla_cppflags,msvc_setup_h"
cond="USE_STC=='1' and BUILDING_LIB=='1'">
<if cond="FORMAT!='autoconf'">
<include>$(SETUPHDIR)</include>
<include>$(TOP_SRCDIR)include</include>
</if>
<define>$(wxscintilla_usingdll)</define>
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<define>$(DEBUG_DEFINE)</define>
<define>$(UNICODE_DEFINE)</define>
<dirname>$(LIBDIRNAME)</dirname>
<sources>
src/stc/scintilla/src/AutoComplete.cxx
@@ -152,7 +163,7 @@
</sources>
</lib>
<!-- use this to conditonally link against wxscintilla with <library>: -->
<!-- used to conditionally link against wxscintilla only if it's enabled -->
<set var="wxscintilla_library_link">
<if cond="USE_STC=='1' and BUILDING_LIB=='1'">wxscintilla</if>
</set>

View File

@@ -23,7 +23,7 @@
3. Else, i.e. if there were no changes at all to API but only internal
changes, change C:R:A to C:R+1:A
-->
<set var="WX_CURRENT">1</set>
<set var="WX_CURRENT">4</set>
<set var="WX_REVISION">0</set>
<set var="WX_AGE">0</set>

View File

@@ -40,7 +40,7 @@
<subproject id="samples">
<installable>no</installable>
<dir cond="FORMAT=='autoconf'">samples</dir>
<dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir>
<dir cond="FORMAT!='autoconf'">../../samples</dir>
</subproject>
<if cond="FORMAT=='autoconf'">
@@ -97,7 +97,7 @@
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
(cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
(cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
</command>
</action>
@@ -178,7 +178,7 @@
<!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
<if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
<if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0'">
<mkdir id="libdir">
<dir>$(LIBDIRNAME)</dir>
</mkdir>
@@ -194,8 +194,8 @@
<set var="SETUP_H_SUBDIR">
<if cond="WXUNIV=='1'">univ</if>
<if cond="WXUNIV=='0' and TOOLKIT!='PM'">$(TOOLKIT_LOWERCASE)</if>
<if cond="WXUNIV=='0' and TOOLKIT=='PM'">os2</if>
<if cond="WXUNIV=='0' and PLATFORM_OS2!='1'">$(TOOLKIT_LOWERCASE)</if>
<if cond="WXUNIV=='0' and PLATFORM_OS2=='1'">os2</if>
</set>
<copy-file-to-file-if-not-exist id="master_setup.h">
@@ -212,7 +212,7 @@
<!-- create rcdefs.h on Windows: -->
<if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">
<if cond="FORMAT in ['borland','mingw','msvc','watcom']">
<mkdir id="libdir_setup_wx_msw">
<depends>libdir_setup_wx</depends>

View File

@@ -89,6 +89,7 @@
NOTE: as a reference here is a list of all wxWidgets libraries satisfying
the dependency constraints mentioned in <wx-lib> description:
<wx-lib>webview</wx-lib>
<wx-lib>richtext</wx-lib>
<wx-lib>aui</wx-lib>
<wx-lib>ribbon</wx-lib>
@@ -124,7 +125,7 @@
tag definitions.
-->
<set var="WX_LIB_LIST">
base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc
base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview
</set>
<!-- if you define this variable to 0 before including wx presets, the
@@ -391,7 +392,7 @@
<!-- Sets as output folder for the current target a directory
called "$(value)/$(COMPILER_PREFIX)_lib|dll", just like wxWidgets does.
This makes it possible to keep separed the libraries/exes compiled with
This makes it possible to keep separated the libraries/exes compiled with
different compilers and with a different value for WX_SHARED.
-->
<define-tag name="wxlike-dirname" rules="lib,dll,exe,module">
@@ -472,7 +473,7 @@
<!-- -->
<!-- Sets the BUILDDIR variable using the same rules used by wxWidgets itself.
This makes it possible to keep separed the object files compiled with
This makes it possible to keep separated the object files compiled with
different configuration settings.
-->
<define-global-tag name="set-wxlike-builddir">

View File

@@ -80,7 +80,7 @@ Format-specific notes:
$(DOLLAR)(shell $(WX_CONFIG) --query-toolkit)
</set>
<option name="WX_PORT">
<values>gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb</values>
<values>gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb</values>
<default-value force="1">$(WX_PORT_DEFAULT)</default-value>
<description>
Port of the wx library to build against

View File

@@ -101,7 +101,7 @@
<set var="WXCPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
<if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">_amd64</if>
<if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='AMD64'">_x64</if>
<if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES=='1' and TARGET_CPU=='IA64'">_ia64</if>
</set>
@@ -174,6 +174,7 @@
<define-wxlib-name>propgrid</define-wxlib-name>
<define-wxlib-name>stc</define-wxlib-name>
<define-wxlib-name>richtext</define-wxlib-name>
<define-wxlib-name>webview</define-wxlib-name>
<!-- NOTE: The GL lib is not part of the monolithic build; treat it as a contrib! -->
@@ -214,6 +215,7 @@
<if cond="value=='ribbon'"><sys-lib>$(WXLIB_RIBBON_NAME)</sys-lib></if>
<if cond="value=='propgrid'"><sys-lib>$(WXLIB_PROPGRID_NAME)</sys-lib></if>
<if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
<if cond="value=='webview'"><sys-lib>$(WXLIB_WEBVIEW_NAME)</sys-lib></if>
<!-- The GL lib isn't part of the monolithic build, treat it as a contrib: -->
<if cond="value=='gl'">

View File

@@ -143,7 +143,7 @@ MyFrame::MyFrame(const wxString& title)
// the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu;
helpMenu->Append(Minimal_About, wxT("&About...\tF1"), wxT("Show about dialog"));
helpMenu->Append(Minimal_About, wxT("&About\tF1"), wxT("Show about dialog"));
menuFile->Append(Minimal_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));

View File

@@ -39,12 +39,12 @@ def mk_wxid(id):
# All libs that are part of the main library:
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'webview',
'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc']
# List of library names/ids for categories with different names:
LIBS_NOGUI = ['xml', 'net']
LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',
'aui', 'propgrid', 'richtext', 'stc', 'ribbon']
'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'webview']
# Additional libraries that must be linked in:
EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)',

View File

@@ -15,7 +15,7 @@
<scheduler>trunk_quick</scheduler>
<steps>
<checkout/>
<configure options="--enable-stl"/>
<configure options="--enable-stl --enable-debug"/>
<compile-all/>
<run-tests/>
</steps>
@@ -39,7 +39,7 @@
<scheduler>daily_0600</scheduler>
<steps>
<checkout/>
<configure options="--disable-unicode"/>
<configure options="--disable-unicode --enable-debug"/>
<compile-all/>
<run-tests/>
</steps>

View File

@@ -27,7 +27,7 @@
<scheduler>daily_0700</scheduler>
<steps>
<checkout/>
<configure options="--with-x11"/>
<configure options="--with-x11 --enable-debug"/>
<compile-all/>
<run-tests/>
</steps>

View File

@@ -33,14 +33,20 @@
</steps>
</build>
<!--
Commented out 64-bit builds as no 64-bit compiler at the moment.
If you're re-enabling them take out the space between the hyphens of the
configure options below, e.g. take out the space from "- -host=".
<build>
<name>MinGW x86_64 trunk</name>
<builddir>tbitcwxbuildbot_mingw64_trunk</builddir>
<!--scheduler>trunk_quick</scheduler-->
<scheduler>trunk_quick</scheduler>
<steps>
<checkout/>
<configure options="--host=amd64-mingw32msvc
--with-cppunit-prefix=/usr/local/amd64-mingw32msvc"/>
<configure options="- -host=amd64-mingw32msvc
- -with-cppunit-prefix=/usr/local/amd64-mingw32msvc"/>
<compile-all/>
</steps>
</build>
@@ -48,13 +54,15 @@
<build>
<name>MinGW x86_64 stable</name>
<builddir>tbitcwxbuildbot_mingw64_stable</builddir>
<!--scheduler>daily_0600</scheduler-->
<scheduler>daily_0600</scheduler>
<steps>
<checkout branch="{$STABLE_BRANCH}"/>
<configure options="--host=amd64-mingw32msvc
--with-cppunit-prefix=/usr/local/amd64-mingw32msvc"/>
<configure options="- -host=amd64-mingw32msvc
- -with-cppunit-prefix=/usr/local/amd64-mingw32msvc"/>
<compile-all utils="false"/>
</steps>
</build>
-->
</bot>

View File

@@ -15,7 +15,7 @@
<scheduler>trunk_quick</scheduler>
<steps>
<checkout/>
<configure options="--enable-compat28"/>
<configure options="--enable-compat28 --enable-debug"/>
<compile-all/>
<run-tests/>
</steps>
@@ -27,7 +27,7 @@
<scheduler>daily_0600</scheduler>
<steps>
<checkout/>
<configure options="--disable-shared"/>
<configure options="--disable-shared --enable-debug"/>
<compile-all/>
<run-tests/>
</steps>
@@ -51,7 +51,7 @@
<scheduler>daily_0600</scheduler>
<steps>
<checkout/>
<configure options="--with-directfb"/>
<configure options="--with-directfb --enable-debug"/>
<compile-all/>
<run-tests/>
</steps>
@@ -69,4 +69,40 @@
</steps>
</build>
<!-- These last three are ravnsgaard's job's moved here while it is down -->
<build>
<name>Linux i386 wxGTK stable STL</name>
<builddir>brandt32_wxgtk_stable</builddir>
<scheduler>stable_quick</scheduler>
<steps>
<checkout branch="{$STABLE_BRANCH}"/>
<configure options="--enable-stl"/>
<compile-all utils="false"/>
<run-tests/>
</steps>
</build>
<build>
<name>Linux i386 wxGTK trunk no gui</name>
<builddir>brandt32_wxgtk_nogui</builddir>
<scheduler>daily_0600</scheduler>
<steps>
<checkout/>
<configure options="--disable-gui --enable-debug"/>
<compile-all/>
<run-tests/>
</steps>
</build>
<build>
<name>Linux i386 wxGTK trunk no features</name>
<builddir>brandt32_wxgtk_nofeatures</builddir>
<scheduler>daily_0600</scheduler>
<steps>
<checkout/>
<configure options="--disable-all-features --enable-debug"/>
<compile-all utils="false"/>
<run-tests/>
</steps>
</build>
</bot>

View File

@@ -29,8 +29,8 @@
<command>
export DYLD_LIBRARY_PATH=../lib
cd tests &amp;&amp;
./test &amp;&amp;
./test_gui.app/Contents/MacOS/test_gui
./test -t &amp;&amp;
open ./test_gui.app
</command>
</copy-with-defaults>
</test>

View File

@@ -26,6 +26,18 @@
<xsl:variable name="RELEASE_BRANCH"><RELEASE_BRANCH/></xsl:variable>
<xsl:template name="SNAPSHOT_URL">http://biolpc22.york.ac.uk/pub</xsl:template>
<!--
disable - comment out a section.
Usage: <disable>
e.g. <build> ... etc.
</disable>
XML comments can't contain a double hyphen which tends to be used in
configure commands, so <disable> can be used instead.
-->
<xsl:template name="disable"/>
<!--
checkout - build step for source checkout.
@@ -390,10 +402,26 @@ try()
try ./test <xsl:value-of select="normalize-space($options)"/>
if [ -n "$DISPLAY" -a -x test_gui ]; then
try ./test_gui <xsl:value-of select="normalize-space($guioptions)"/>
test -x test_gui || exit $ERR
if [ -z "$DISPLAY" ]; then
echo '$DISPLAY is not set, skipping GUI tests.'
exit $ERR
fi
echo 'Checking window manager:'
WINDOW_MANAGER=$(xprop -root 32x '\n$0\n' _NET_SUPPORTING_WM_CHECK | grep ^0x)
if [ -z "$WINDOW_MANAGER" ]; then
echo 'Window manager not present, skipping GUI tests.'
exit $ERR
fi
xprop -id $WINDOW_MANAGER 8s _NET_WM_NAME
echo
try ./test_gui <xsl:value-of select="normalize-space($guioptions)"/>
exit $ERR
</xsl:template>

View File

@@ -8,10 +8,12 @@
<bot xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="include/unix.xml"/>
<!-- Moved to brandt32 while ranvsgaard is down -->
<disable>
<build>
<name>Linux i386 wxGTK stable STL</name>
<builddir>ravnsgaard_wxgtk_stable</builddir>
<scheduler>trunk_quick</scheduler>
<scheduler>stable_quick</scheduler>
<steps>
<checkout branch="{$STABLE_BRANCH}"/>
<configure options="--enable-stl"/>
@@ -26,7 +28,7 @@
<scheduler>daily_0600</scheduler>
<steps>
<checkout/>
<configure options="--disable-gui"/>
<configure options="--disable-gui --enable-debug"/>
<compile-all/>
<run-tests/>
</steps>
@@ -38,9 +40,10 @@
<scheduler>daily_0600</scheduler>
<steps>
<checkout/>
<configure options="--disable-all-features"/>
<configure options="--disable-all-features --enable-debug"/>
<compile-all utils="false"/>
<run-tests/>
</steps>
</build>
</disable>
</bot>

View File

@@ -1,62 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<bakefile-gen>
<!--
This file contains eperimental build specification for wxMGL port
build with Open Watcom for DOS extenders. In order to get complete
build, please setup:
1. wxWidgets CVS Head
2. SCITECH/MGL toolkit
3. OpenWatcom compiler
4. Bakefile later than 0.1.9.1 (CVS at time of writing this)
To get Open Watcom makefiles for wxMGL port: open console under Windows,
setup environment for toolkits listed above and then run:
cd %WXWIN%\build\bakefiles
bakefile_gen -f watcom -d ../mgl/Bakefiles.mgl.bkgen
cd %WXWIN%\build\mgl
wmake -h -f makefile.wat
cd %WXWIN%\samples\minimal
wmake -h -f makefile.wat
Default build settings are located in %WXWIN%\build\mgl\config.wat
Note that currently you can't have watcom makefiles for building samples
for different platforms in the same tree.
-->
<add-flags formats="watcom">
-DPLATFORM_MSDOS=1
</add-flags>
<include file="../bakefiles/Bakefiles.bkgen"/>
<add-flags files="wx.bkl" formats="watcom">
-o../mgl/makefile.wat
</add-flags>
<add-flags files="../bakefiles/wx.bkl" formats="watcom">
-DOPTIONS_FILE=config.wat
</add-flags>
<add-flags files="../../*/*" formats="watcom">
-DOPTIONS_FILE=../build/mgl/config.wat
</add-flags>
<add-flags files="../../*/*/*" formats="watcom">
-DOPTIONS_FILE=../../build/mgl/config.wat
</add-flags>
<add-flags files="../../*/*/*/*" formats="watcom">
-DOPTIONS_FILE=../../../build/mgl/config.wat
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="watcom">
-DOPTIONS_FILE=../../../../build/mgl/config.wat
</add-flags>
</bakefile-gen>

View File

@@ -1,127 +0,0 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
# -------------------------------------------------------------------------
# These are configurable options:
# -------------------------------------------------------------------------
# DOS32 mode/extender [X32VM,X32,PMODEW,CAUSEWAY,DOS32A,DOS4GW]
# X32VM - FlashTek X-32VM DOS extender
# X32 - FlashTek X-32 DOS extender
# PMODEW - PMODE/W
# CAUSEWAY - CauseWay DOS extender
# DOS32A - DOS32/A
# DOS4GW - Tenberry/Watcom 32-bit DOS extender
DOS32 = DOS4GW
# C compiler
CC = wcc386
# C++ compiler
CXX = wpp386
# Standard flags for CC
CFLAGS =
# Standard flags for C++
CXXFLAGS =
# Standard preprocessor flags (common for CC and CXX)
CPPFLAGS =
# Standard linker flags
LDFLAGS =
# The C preprocessor
CPP = $(CC) -p
# What type of library to build? [0,1]
# 1 - DLL
SHARED = 0
# Compile Unicode build of wxWidgets? [0,1]
# 1 - Unicode
UNICODE = 0
# Type of compiled binaries [debug,release]
BUILD = debug
# Should debugging info be included in the executables? The default value
# "default" means that debug info will be included if BUILD=debug
# and not included if BUILD=release. [0,1,default]
DEBUG_INFO = default
# Should __WXDEBUG__ be defined? The default value "default" means that it will
# be defined if BUILD=debug and not defined if BUILD=release. [0,1,default]
DEBUG_FLAG = default
# Multiple libraries or single huge monolithic one? [0,1]
# 0 - Multilib
# 1 - Monolithic
MONOLITHIC = 1
# Build GUI libraries? [0,1]
# 0 - Base
# 1 - GUI
USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build multimedia library (USE_GUI must be 1)? [0,1]
USE_MEDIA = 1
# Build wxXRC library (USE_GUI must be 1)? [0,1]
USE_XRC = 1
# Build wxAUI library (USE_GUI must be 1)? [0,1]
USE_AUI = 1
# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]
USE_RICHTEXT = 1
# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]
USE_OPENGL = 0
# Build quality assurance classes library (USE_GUI must be 1)? [0,1]
USE_QA = 0
# Enable exceptions in compiled code. [0,1]
USE_EXCEPTIONS = 1
# Enable run-time type information (RTTI) in compiled code. [0,1]
USE_RTTI = 1
# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]
USE_GDIPLUS = 0
# Is this official build by wxWidgets developers? [0,1]
OFFICIAL_BUILD = 0
# Use this to name your customized DLLs differently
VENDOR = custom
#
WX_FLAVOUR =
#
WX_LIB_FLAVOUR =
# Name of your custom configuration. This affects directory
# where object files are stored as well as the location of
# compiled .lib files and setup.h under the lib/ toplevel directory.
CFG =
# Compiler flags needed to compile test suite in tests directory. If you want
# to run the tests, set it so that the compiler can find CppUnit headers.
CPPUNIT_CFLAGS =
# Linker flags needed to link test suite in tests directory. If you want
# to run the tests, include CppUnit library here.
CPPUNIT_LIBS =

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.2.8 (http://www.bakefile.org)
# Bakefile 0.2.9 (http://www.bakefile.org)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
@@ -99,6 +99,11 @@ USE_GUI = 1
USE_HTML = 1
!endif
# Build wxWebView library (USE_GUI must be 1)? [0,1]
!ifndef USE_WEBVIEW
USE_WEBVIEW = 1
!endif
# Build multimedia library (USE_GUI must be 1)? [0,1]
!ifndef USE_MEDIA
USE_MEDIA = 1

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.2.8 (http://www.bakefile.org)
# Bakefile 0.2.9 (http://www.bakefile.org)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
@@ -71,6 +71,9 @@ USE_GUI ?= 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML ?= 1
# Build wxWebView library (USE_GUI must be 1)? [0,1]
USE_WEBVIEW ?= 1
# Build multimedia library (USE_GUI must be 1)? [0,1]
USE_MEDIA ?= 1

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.2.8 (http://www.bakefile.org)
# Bakefile 0.2.9 (http://www.bakefile.org)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
@@ -52,7 +52,8 @@ BUILD = debug
# PATH. Rather it affects some options passed to some of the common build
# utilities such as the resource compiler and the linker.
#
# Accepted values: AMD64, IA64.
# Accepted values: IA64, X64
# (AMD64 accepted as synonym for X64 but should not be used any more).
TARGET_CPU = $(CPU)
# Should debugging info be included in the executables? The default value
@@ -78,6 +79,9 @@ USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build wxWebView library (USE_GUI must be 1)? [0,1]
USE_WEBVIEW = 1
# Build multimedia library (USE_GUI must be 1)? [0,1]
USE_MEDIA = 1

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This configuration file was generated by
# Bakefile 0.2.8 (http://www.bakefile.org)
# Bakefile 0.2.9 (http://www.bakefile.org)
# Beware that all changes made to this file will be overwritten next
# time you run Bakefile!
# =========================================================================
@@ -69,6 +69,9 @@ USE_GUI = 1
# Build wxHTML library (USE_GUI must be 1)? [0,1]
USE_HTML = 1
# Build wxWebView library (USE_GUI must be 1)? [0,1]
USE_WEBVIEW = 1
# Build multimedia library (USE_GUI must be 1)? [0,1]
USE_MEDIA = 1

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -158,6 +158,18 @@ Package=<4>
###############################################################################
Project: "webview"=wx_webview.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "qa"=wx_qa.dsp - Package Owner=<4>
Package=<5>

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_adv_vc_custom.pdb"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_adv_vc_custom.pdb"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_adv_vc_custom.pdb"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\adv"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_advdll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_ADV" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_adv_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_ADV
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_adv.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_adv_vc_custom.pdb"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
@@ -266,10 +266,22 @@ SOURCE=..\..\src\common\dummy.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\gridcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\hyperlnkcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\odcombocmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\richtooltipcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\taskbarcmn.cpp
# End Source File
# End Group
@@ -347,6 +359,41 @@ SOURCE=..\..\src\msw\calctrl.cpp
!ELSEIF "$(CFG)" == "adv - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\commandlinkbutton.cpp
!IF "$(CFG)" == "adv - Win32 DLL Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 Release"
!ELSEIF "$(CFG)" == "adv - Win32 Debug"
!ENDIF
# End Source File
@@ -417,6 +464,76 @@ SOURCE=..\..\src\msw\datectrl.cpp
!ELSEIF "$(CFG)" == "adv - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\datetimectrl.cpp
!IF "$(CFG)" == "adv - Win32 DLL Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 Release"
!ELSEIF "$(CFG)" == "adv - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\hyperlink.cpp
!IF "$(CFG)" == "adv - Win32 DLL Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 Release"
!ELSEIF "$(CFG)" == "adv - Win32 Debug"
!ENDIF
# End Source File
@@ -430,6 +547,10 @@ SOURCE=..\..\src\msw\notifmsg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\richtooltip.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\sound.cpp
# End Source File
# Begin Source File
@@ -438,6 +559,41 @@ SOURCE=..\..\src\msw\taskbar.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\timectrl.cpp
!IF "$(CFG)" == "adv - Win32 DLL Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "adv - Win32 Release"
!ELSEIF "$(CFG)" == "adv - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "adv - Win32 DLL Universal Release"
@@ -485,6 +641,10 @@ SOURCE=..\..\src\generic\animateg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\bannerwindow.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\bmpcboxg.cpp
# End Source File
# Begin Source File
@@ -493,6 +653,10 @@ SOURCE=..\..\src\generic\calctrlg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\commandlinkbuttong.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\datavgen.cpp
# End Source File
# Begin Source File
@@ -545,6 +709,10 @@ SOURCE=..\..\src\generic\propdlg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\richtooltipg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\sashwin.cpp
# End Source File
# Begin Source File
@@ -553,10 +721,18 @@ SOURCE=..\..\src\generic\splash.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\timectrlg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\tipdlg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\treelist.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\wizard.cpp
# End Source File
# End Group
@@ -719,10 +895,18 @@ SOURCE=..\..\include\wx\msw\calctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\commandlinkbutton.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\datectrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\datetimectrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "adv - Win32 DLL Universal Release"
@@ -810,6 +994,10 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\hyperlink.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\joystick.h
# End Source File
# Begin Source File
@@ -824,6 +1012,10 @@ SOURCE=..\..\include\wx\msw\sound.h
SOURCE=..\..\include\wx\msw\taskbar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\timectrl.h
# End Source File
# End Group
# Begin Group "Generic Headers"
@@ -906,6 +1098,10 @@ SOURCE=..\..\include\wx\generic\splash.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\timectrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\wizard.h
# End Source File
# End Group
@@ -922,6 +1118,10 @@ SOURCE=..\..\include\wx\animate.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\bannerwindow.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\bmpcbox.h
# End Source File
# Begin Source File
@@ -930,6 +1130,10 @@ SOURCE=..\..\include\wx\calctrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\commandlinkbutton.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\dataview.h
# End Source File
# Begin Source File
@@ -942,6 +1146,10 @@ SOURCE=..\..\include\wx\dateevt.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\datetimectrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\dcbuffer.h
# End Source File
# Begin Source File
@@ -982,6 +1190,10 @@ SOURCE=..\..\include\wx\propdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\richtooltip.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\sashwin.h
# End Source File
# Begin Source File
@@ -998,10 +1210,18 @@ SOURCE=..\..\include\wx\taskbar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\timectrl.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\tipdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\treelist.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\wizard.h
# End Source File
# End Group

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\aui"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_aui_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_aui_vc_custom.pdb"
!ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\aui"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_aui_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_aui_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_aui_vc_custom.pdb"
!ELSEIF "$(CFG)" == "aui - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\aui"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_aui_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_aui_vc_custom.pdb"
!ELSEIF "$(CFG)" == "aui - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\aui"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_auidll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_AUI" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_aui_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_AUI
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_aui_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_aui_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_aui.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_aui_vc_custom.pdb"
!ELSEIF "$(CFG)" == "aui - Win32 Universal Release"
@@ -293,77 +293,6 @@ SOURCE=..\..\src\msw\version.rc
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "aui - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "aui - Win32 DLL Universal Release"
@@ -432,6 +361,77 @@ InputPath=..\..\include\wx\msw\setup.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "aui - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "aui - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"
@@ -554,6 +554,10 @@ SOURCE=..\..\include\wx\aui\framemanager.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\aui\tabart.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\aui\tabmdi.h
# End Source File
# End Group
@@ -582,6 +586,10 @@ SOURCE=..\..\src\aui\framemanager.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\aui\tabart.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\aui\tabmdi.cpp
# End Source File
# End Group

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\base"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"
!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\base"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb"
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb"
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"
!ELSEIF "$(CFG)" == "base - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\base"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291u_vc_custom.pdb"
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_vc_custom.pdb"
!ELSEIF "$(CFG)" == "base - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\base"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_basedll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXMAKINGDLL_BASE" /D wxUSE_BASE=1 /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXMAKINGDLL_BASE" /d wxUSE_BASE=1
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb"
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291ud_vc_custom.pdb"
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_vc_custom.pdb"
!ELSEIF "$(CFG)" == "base - Win32 Universal Release"
@@ -451,6 +451,10 @@ SOURCE=..\..\src\common\mstream.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\numformatter.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\object.cpp
# End Source File
# Begin Source File
@@ -527,6 +531,10 @@ SOURCE=..\..\src\common\textfile.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\time.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\timercmn.cpp
# End Source File
# Begin Source File
@@ -1227,6 +1235,10 @@ SOURCE=..\..\include\wx\event.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\eventfilter.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\evtloop.h
# End Source File
# Begin Source File
@@ -1315,6 +1327,10 @@ SOURCE=..\..\include\wx\meta\if.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\meta\implicitconversion.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\init.h
# End Source File
# Begin Source File
@@ -1411,6 +1427,10 @@ SOURCE=..\..\include\wx\mstream.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\numformatter.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\object.h
# End Source File
# Begin Source File
@@ -1451,6 +1471,10 @@ SOURCE=..\..\include\wx\regex.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\rtti.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\scopedarray.h
# End Source File
# Begin Source File
@@ -1543,6 +1567,10 @@ SOURCE=..\..\include\wx\thread.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\time.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\timer.h
# End Source File
# Begin Source File
@@ -1603,6 +1631,10 @@ SOURCE=..\..\include\wx\version.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\versioninfo.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\volume.h
# End Source File
# Begin Source File
@@ -1647,10 +1679,30 @@ SOURCE=..\..\include\wx\xti.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xti2.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xtictor.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xtihandler.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xtiprop.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xtistrm.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\xtitypes.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\zipstrm.h
# End Source File
# Begin Source File

File diff suppressed because it is too large Load Diff

View File

@@ -288,6 +288,21 @@ Package=<4>
###############################################################################
Project: "ribbon"=.\wx_ribbon.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name core
End Project Dependency
}}}
###############################################################################
Project: "richtext"=.\wx_richtext.dsp - Package Owner=<4>
Package=<5>

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_gl_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_gl_vc_custom.pdb"
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_gl_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_gl_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmswuniv29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_gl_vc_custom.pdb"
!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_gl_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29u_core.lib wxbase29u.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_gl_vc_custom.pdb"
!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\gl"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_gldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_GL" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_gl_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_GL
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_gl_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_gl_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib wxmsw29ud_core.lib wxbase29ud.lib opengl32.lib glu32.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_gl.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_gl_vc_custom.pdb"
!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
@@ -301,77 +301,6 @@ SOURCE=..\..\src\msw\version.rc
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "gl - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "gl - Win32 DLL Universal Release"
@@ -440,6 +369,77 @@ InputPath=..\..\include\wx\msw\setup.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "gl - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "gl - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_html_vc_custom.pdb"
!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_html_vc_custom.pdb"
!ELSEIF "$(CFG)" == "html - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_html_vc_custom.pdb"
!ELSEIF "$(CFG)" == "html - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\html"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_htmldll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_HTML" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_html_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_HTML
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_html.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_html_vc_custom.pdb"
!ELSEIF "$(CFG)" == "html - Win32 Universal Release"

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\media"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_media_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_media_vc_custom.pdb"
!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\media"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_media_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_media_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_media_vc_custom.pdb"
!ELSEIF "$(CFG)" == "media - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\media"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_media_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_media_vc_custom.pdb"
!ELSEIF "$(CFG)" == "media - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\media"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_mediadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_MEDIA" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_media_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_MEDIA
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_media_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_media_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_media.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_media_vc_custom.pdb"
!ELSEIF "$(CFG)" == "media - Win32 Universal Release"
@@ -309,77 +309,6 @@ SOURCE=..\..\src\msw\version.rc
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "media - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "media - Win32 DLL Universal Release"
@@ -448,6 +377,77 @@ InputPath=..\..\include\wx\msw\setup.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "media - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "media - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb"
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291ud_net_vc_custom.pdb"
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291ud_net_vc_custom.pdb"
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"
!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294u_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291u_net_vc_custom.pdb"
# ADD BASE LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"
# ADD LINK32 wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29u_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294u_net_vc_custom.pdb"
!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\net"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase291ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_netdll.pch" /Zi /Fd..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_GUI=0 /D "WXUSINGDLL" /D "WXMAKINGDLL_NET" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase291ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxbase294ud_net_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d wxUSE_GUI=0 /d "WXUSINGDLL" /d WXMAKINGDLL_NET
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291ud_net_vc_custom.pdb"
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase291ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase291ud_net_vc_custom.pdb"
# ADD BASE LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"
# ADD LINK32 wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxbase29ud_net.lib" /debug /pdb:"..\..\lib\vc_dll\wxbase294ud_net_vc_custom.pdb"
!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
@@ -341,77 +341,6 @@ SOURCE=..\..\src\msw\version.rc
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "net - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "net - Win32 DLL Universal Release"
@@ -480,6 +409,77 @@ InputPath=..\..\include\wx\msw\setup.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "net - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "net - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"
@@ -571,10 +571,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\private\sockmsw.h
# End Source File
# End Group
# Begin Group "Common Headers"

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\propgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_propgrid_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_propgrid_vc_custom.pdb"
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\propgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_propgrid_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_propgrid_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_propgrid_vc_custom.pdb"
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\propgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_propgrid_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_propgrid_vc_custom.pdb"
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\propgrid"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_propgriddll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_PROPGRID" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_propgrid_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_PROPGRID
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_propgrid_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_propgrid_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_propgrid.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_propgrid_vc_custom.pdb"
!ELSEIF "$(CFG)" == "propgrid - Win32 Universal Release"
@@ -293,77 +293,6 @@ SOURCE=..\..\src\msw\version.rc
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "propgrid - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "propgrid - Win32 DLL Universal Release"
@@ -432,6 +361,77 @@ InputPath=..\..\include\wx\msw\setup.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "propgrid - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "propgrid - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\qa"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_qa_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_qa_vc_custom.pdb"
!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\qa"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_qa_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_qa_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_qa_vc_custom.pdb"
!ELSEIF "$(CFG)" == "qa - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\qa"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_qa_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib ..\..\lib\vc_dll\wxbase29u_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_qa_vc_custom.pdb"
!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\qa"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_qadll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_QA" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_qa_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_QA
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_qa_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_qa_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_qa.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_qa_vc_custom.pdb"
!ELSEIF "$(CFG)" == "qa - Win32 Universal Release"
@@ -305,77 +305,6 @@ SOURCE=..\..\src\generic\dbgrptg.cpp
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "qa - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "qa - Win32 DLL Universal Release"
@@ -444,6 +373,77 @@ InputPath=..\..\include\wx\msw\setup.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "qa - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "qa - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"

View File

@@ -47,18 +47,18 @@ RSC=rc.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\ribbon"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291u_ribbon_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294u_ribbon_vc_custom.pdb"
!ELSEIF "$(CFG)" == "ribbon - Win32 DLL Universal Debug"
@@ -72,18 +72,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\ribbon"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv294ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv291ud_ribbon_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv294ud_ribbon_vc_custom.pdb"
!ELSEIF "$(CFG)" == "ribbon - Win32 DLL Release"
@@ -97,18 +97,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\ribbon"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294u_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291u_ribbon_vc_custom.pdb"
# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb"
# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294u_ribbon_vc_custom.pdb"
!ELSEIF "$(CFG)" == "ribbon - Win32 DLL Debug"
@@ -122,18 +122,18 @@ LINK32=link.exe
# PROP Output_Dir "..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\ribbon"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_ribbondll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_RIBBON" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw291ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw294ud_ribbon_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d WXMAKINGDLL_RIBBON
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw291ud_ribbon_vc_custom.pdb"
# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb"
# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_ribbon.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw294ud_ribbon_vc_custom.pdb"
!ELSEIF "$(CFG)" == "ribbon - Win32 Universal Release"
@@ -293,77 +293,6 @@ SOURCE=..\..\src\msw\version.rc
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "ribbon - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "ribbon - Win32 DLL Universal Release"
@@ -432,6 +361,77 @@ InputPath=..\..\include\wx\msw\setup.h
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "ribbon - Win32 DLL Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 DLL Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 DLL Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 DLL Debug"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 Universal Release"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 Universal Debug"
# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
InputPath=..\..\include\wx\univ\setup.h
"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 Release"
# Begin Custom Build -
# End Custom Build
!ELSEIF "$(CFG)" == "ribbon - Win32 Debug"
# Begin Custom Build -
# End Custom Build
!ENDIF
# End Source File
# End Group
# Begin Group "MSW Headers"

Some files were not shown because too many files have changed in this diff Show More