]> git.saurik.com Git - wxWidgets.git/log
wxWidgets.git
12 years agoMinor fixes to wxDataViewCtrl::HitTest() in wxGTK.
Vadim Zeitlin [Wed, 25 Jan 2012 00:05:03 +0000 (00:05 +0000)] 
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

12 years agoSet the initial size of the expanded ribbon panel correctly.
Vadim Zeitlin [Wed, 25 Jan 2012 00:04:59 +0000 (00:04 +0000)] 
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

12 years agoFix setting frame icon when using non-standard icon sizes in wxMSW.
Vadim Zeitlin [Tue, 24 Jan 2012 22:17:47 +0000 (22:17 +0000)] 
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

12 years agoAppend all items at once during wxChoice creation in wxMSW.
Vadim Zeitlin [Tue, 24 Jan 2012 21:50:34 +0000 (21:50 +0000)] 
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

12 years agoadd strike-through font support to wxGraphicsContext on GTK
Paul Cornett [Tue, 24 Jan 2012 18:07:45 +0000 (18:07 +0000)] 
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

12 years agoadding missing stubs
Stefan Csomor [Mon, 23 Jan 2012 21:06:07 +0000 (21:06 +0000)] 
adding missing stubs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoAdd unit test verifying compilation of various wxFont ctors.
Vadim Zeitlin [Mon, 23 Jan 2012 14:42:56 +0000 (14:42 +0000)] 
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

12 years agoFix wxButtonToolBar compilation after adding new wxFont ctor overload.
Vadim Zeitlin [Mon, 23 Jan 2012 14:42:53 +0000 (14:42 +0000)] 
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

12 years agoAdd a property to configure file property dialog kind.
Vadim Zeitlin [Mon, 23 Jan 2012 13:59:52 +0000 (13:59 +0000)] 
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

12 years agoFix wxTextAttr::m_fontStrikethrough initialization.
Vadim Zeitlin [Mon, 23 Jan 2012 12:33:03 +0000 (12:33 +0000)] 
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

12 years agoImplement support for stricken-through fonts in markup parser.
Vadim Zeitlin [Mon, 23 Jan 2012 11:28:32 +0000 (11:28 +0000)] 
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

12 years agoAdd support for stricken-through fonts.
Vadim Zeitlin [Mon, 23 Jan 2012 11:28:28 +0000 (11:28 +0000)] 
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

12 years agoAdd wxFont ctor taking a single flags argument instead of style/weight/...
Vadim Zeitlin [Mon, 23 Jan 2012 11:28:21 +0000 (11:28 +0000)] 
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

12 years agoFix wxAffineMatrix2D::Translate() to multiply on the left.
Vadim Zeitlin [Mon, 23 Jan 2012 11:28:16 +0000 (11:28 +0000)] 
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

12 years agoFix incorrect scroll positions used in SetScrollbars().
Vadim Zeitlin [Mon, 23 Jan 2012 11:28:12 +0000 (11:28 +0000)] 
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

12 years agoAdd check for wxFileCtrl dependency on wxDateTime to wx/chkconf.h.
Vadim Zeitlin [Mon, 23 Jan 2012 11:28:09 +0000 (11:28 +0000)] 
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

12 years agoFix incorrect cast resulting in a warning in wxMSW wxMenu code.
Vadim Zeitlin [Mon, 23 Jan 2012 11:28:05 +0000 (11:28 +0000)] 
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

12 years agoAvoid warnings about mismatched format string in wxMSW wxClipboard code.
Vadim Zeitlin [Mon, 23 Jan 2012 11:28:01 +0000 (11:28 +0000)] 
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

12 years agoUpdate OS X toolkit names list in wxwin.m4.
Vadim Zeitlin [Mon, 23 Jan 2012 11:27:57 +0000 (11:27 +0000)] 
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

12 years agousing existing member
Stefan Csomor [Mon, 23 Jan 2012 11:15:18 +0000 (11:15 +0000)] 
using existing member

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoFixed typo in variable name, fixing #13872.
Stefan Neis [Sun, 22 Jan 2012 17:27:09 +0000 (17:27 +0000)] 
Fixed typo in variable name, fixing #13872.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoAdded a simple benchmark of wxLogDebug() and wxLogTrace().
Vadim Zeitlin [Sun, 22 Jan 2012 00:58:09 +0000 (00:58 +0000)] 
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

12 years agoCreate wxStaticText with correct label directly in wxTextSizerWrapper.
Vadim Zeitlin [Sun, 22 Jan 2012 00:58:05 +0000 (00:58 +0000)] 
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

12 years agoFix reparenting generic wxSpinCtrl.
Vadim Zeitlin [Sat, 21 Jan 2012 17:03:52 +0000 (17:03 +0000)] 
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

12 years agodeleted CodeWarrior project files
Dimitri Schoolwerth [Sat, 21 Jan 2012 00:53:21 +0000 (00:53 +0000)] 
deleted CodeWarrior project files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoFixed mismatch in amount of format specifiers in Japanese translation for i18n sample.
Dimitri Schoolwerth [Sat, 21 Jan 2012 00:01:00 +0000 (00:01 +0000)] 
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

12 years agoUpdate the message catalog charset expected by the unit test.
Vadim Zeitlin [Fri, 20 Jan 2012 23:18:29 +0000 (23:18 +0000)] 
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

12 years agoFix time zone in wxDateTime::UNow().
Vadim Zeitlin [Fri, 20 Jan 2012 22:11:55 +0000 (22:11 +0000)] 
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

12 years agoEnsure wxCharTypeBuffer data is NUL-terminated after extend() call.
Vadim Zeitlin [Fri, 20 Jan 2012 22:11:51 +0000 (22:11 +0000)] 
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

12 years agoFix documentation of wxConfig::Read(float*) overload.
Vadim Zeitlin [Fri, 20 Jan 2012 22:11:47 +0000 (22:11 +0000)] 
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

12 years agoAdd error checking when retrieving client data from wxMSW wxListBox.
Vadim Zeitlin [Fri, 20 Jan 2012 22:11:44 +0000 (22:11 +0000)] 
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

12 years agoCheck that an error really occurred when getting wxChoice data in wxMSW.
Vadim Zeitlin [Fri, 20 Jan 2012 22:11:39 +0000 (22:11 +0000)] 
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

12 years agoDestroy modeless wxGenericAboutDialog when it is closed.
Vadim Zeitlin [Fri, 20 Jan 2012 22:11:32 +0000 (22:11 +0000)] 
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

12 years agoRemoved ellipsis from "About..." occurrences.
Dimitri Schoolwerth [Fri, 20 Jan 2012 16:51:09 +0000 (16:51 +0000)] 
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

12 years agoChanged .po files to use UTF-8 charset.
Dimitri Schoolwerth [Fri, 20 Jan 2012 16:33:41 +0000 (16:33 +0000)] 
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

12 years agoReset next wxMenu event handler in wxUniv when detaching it from wxMenuBar.
Vadim Zeitlin [Fri, 20 Jan 2012 12:35:14 +0000 (12:35 +0000)] 
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

12 years agoTry to avoid truncation of the message in wxMSW wxMessageDialog.
Vadim Zeitlin [Fri, 20 Jan 2012 12:30:08 +0000 (12:30 +0000)] 
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

12 years agoAdd SetPostBuffer(wxMemoryBuffer) and SetPostText() to wxHTTP.
Vadim Zeitlin [Fri, 20 Jan 2012 12:22:25 +0000 (12:22 +0000)] 
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

12 years agoAdded wxMemoryBuffer::Clear() and IsEmpty() methods.
Vadim Zeitlin [Fri, 20 Jan 2012 12:22:22 +0000 (12:22 +0000)] 
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

12 years agoRespect image mask in the docview sample.
Vadim Zeitlin [Thu, 19 Jan 2012 22:17:17 +0000 (22:17 +0000)] 
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

12 years agoadapting to new raw_control
Stefan Csomor [Thu, 19 Jan 2012 15:09:02 +0000 (15:09 +0000)] 
adapting to new raw_control

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agofixing m_axe access indices
Stefan Csomor [Thu, 19 Jan 2012 15:06:22 +0000 (15:06 +0000)] 
fixing m_axe access indices

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoguard against invalid color ref
Stefan Csomor [Thu, 19 Jan 2012 15:01:47 +0000 (15:01 +0000)] 
guard against invalid color ref

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agosolving include order problems for stl and xti
Stefan Csomor [Thu, 19 Jan 2012 15:01:01 +0000 (15:01 +0000)] 
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

12 years agouse better backward compatibility for menu_open, don't autoenable
Stefan Csomor [Thu, 19 Jan 2012 14:59:35 +0000 (14:59 +0000)] 
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

12 years agoguard against invalid color ref
Stefan Csomor [Thu, 19 Jan 2012 14:06:36 +0000 (14:06 +0000)] 
guard against invalid color ref

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agosolving include order problems for stl and xti
Stefan Csomor [Thu, 19 Jan 2012 14:04:47 +0000 (14:04 +0000)] 
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

12 years agoattempt for workaround for stl forward declaration problems
Stefan Csomor [Thu, 19 Jan 2012 09:50:46 +0000 (09:50 +0000)] 
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

12 years agogcc 4.3 issues warning if type attributes are given again - even if they are identica...
Stefan Csomor [Thu, 19 Jan 2012 09:45:49 +0000 (09:45 +0000)] 
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

12 years agogcc 4.3 issues warning if type attributes are given again - even if they are identica...
Stefan Csomor [Thu, 19 Jan 2012 09:00:29 +0000 (09:00 +0000)] 
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

12 years agoadding unix defaults
Stefan Csomor [Thu, 19 Jan 2012 08:55:41 +0000 (08:55 +0000)] 
adding unix defaults

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoSkip EVT_RIGHT_UP event in wxHtmlWindow if it wasn't handled.
Vadim Zeitlin [Wed, 18 Jan 2012 23:12:03 +0000 (23:12 +0000)] 
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

12 years agoreplaced _T() usage with wxT()
Dimitri Schoolwerth [Wed, 18 Jan 2012 23:10:59 +0000 (23:10 +0000)] 
replaced _T() usage with wxT()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoAvoid needless second string conversion when adding files to memory FS.
Vadim Zeitlin [Wed, 18 Jan 2012 19:42:58 +0000 (19:42 +0000)] 
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

12 years agoGave proper spacing to header include sections.
Bryan Petty [Wed, 18 Jan 2012 19:14:16 +0000 (19:14 +0000)] 
Gave proper spacing to header include sections.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoSynchronised svn:eol-style and svn:executable properties of some file types.
Dimitri Schoolwerth [Wed, 18 Jan 2012 18:00:07 +0000 (18:00 +0000)] 
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

12 years agomerged libpng 1.5.7 to trunk
Dimitri Schoolwerth [Wed, 18 Jan 2012 17:55:54 +0000 (17:55 +0000)] 
merged libpng 1.5.7 to trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoDon't auto-link with 3rd party libraries in DLL build using MSVC.
Vadim Zeitlin [Wed, 18 Jan 2012 17:26:23 +0000 (17:26 +0000)] 
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

12 years agofixing RTTI
Stefan Csomor [Wed, 18 Jan 2012 14:19:01 +0000 (14:19 +0000)] 
fixing RTTI

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoadding conversion for stl
Stefan Csomor [Wed, 18 Jan 2012 14:05:39 +0000 (14:05 +0000)] 
adding conversion for stl

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoNo changes, just minor wxMSW code cleanup: use WinStruct<>.
Vadim Zeitlin [Wed, 18 Jan 2012 10:05:27 +0000 (10:05 +0000)] 
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

12 years agoFix header formatting problem in wxMessageBox() documentation.
Vadim Zeitlin [Wed, 18 Jan 2012 09:51:38 +0000 (09:51 +0000)] 
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

12 years agoRemoved wxQt build slave
Javier Torres [Wed, 18 Jan 2012 00:25:17 +0000 (00:25 +0000)] 
Removed wxQt build slave

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoConsistently use "checked" in wxRadioButton documentation.
Vadim Zeitlin [Tue, 17 Jan 2012 23:48:01 +0000 (23:48 +0000)] 
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

12 years agomissing commit, see #10269
Stefan Csomor [Tue, 17 Jan 2012 21:54:02 +0000 (21:54 +0000)] 
missing commit, see #10269

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoAdded drawing context to allow 'virtual' (dynamic) attributes, for e.g. showing bookm...
Julian Smart [Tue, 17 Jan 2012 20:03:13 +0000 (20:03 +0000)] 
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

12 years agoReplace wxDataViewCtrl::StartEditor() with EditItem().
Václav Slavík [Tue, 17 Jan 2012 14:05:17 +0000 (14:05 +0000)] 
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

12 years agoRemoved unused, wrong wxDataViewCtrl code.
Václav Slavík [Tue, 17 Jan 2012 14:05:11 +0000 (14:05 +0000)] 
Removed unused, wrong wxDataViewCtrl code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoAdd wxDataViewCtrl::GetCurrentColumn().
Václav Slavík [Tue, 17 Jan 2012 14:05:07 +0000 (14:05 +0000)] 
Add wxDataViewCtrl::GetCurrentColumn().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoSupport for undoable application of custom properties, and customisation of propertie...
Julian Smart [Tue, 17 Jan 2012 12:56:53 +0000 (12:56 +0000)] 
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

12 years agoDeleted SetTypeFromExtension.sea.hqx.
Dimitri Schoolwerth [Tue, 17 Jan 2012 06:18:01 +0000 (06:18 +0000)] 
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

12 years agoDeleted makefile.mgl.
Dimitri Schoolwerth [Tue, 17 Jan 2012 06:12:17 +0000 (06:12 +0000)] 
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

12 years agoFixed keyboard navigation in generic tree control.
Dimitri Schoolwerth [Tue, 17 Jan 2012 06:06:34 +0000 (06:06 +0000)] 
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

12 years agoFixed duplicate comment #13871
Julian Smart [Mon, 16 Jan 2012 19:02:19 +0000 (19:02 +0000)] 
Fixed duplicate comment #13871

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoOnly return the requested data from generic wxListCtrl::GetItem().
Vadim Zeitlin [Mon, 16 Jan 2012 13:37:18 +0000 (13:37 +0000)] 
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

12 years agoSet all event fields correctly for drag events in generic wxListCtrl.
Vadim Zeitlin [Mon, 16 Jan 2012 13:37:14 +0000 (13:37 +0000)] 
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

12 years agoRemove more non-standard keywords from wxWebView MSW header.
Vadim Zeitlin [Mon, 16 Jan 2012 12:56:09 +0000 (12:56 +0000)] 
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

12 years agoRemove MSVC specific specifiers from wxWebView code.
Steve Lamerton [Mon, 16 Jan 2012 08:21:33 +0000 (08:21 +0000)] 
Remove MSVC specific specifiers from wxWebView code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoFix another typo in section names in the XRC overview.
Vadim Zeitlin [Sun, 15 Jan 2012 23:39:57 +0000 (23:39 +0000)] 
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

12 years agoFix wxBitmapToggleButton section name in XRC format overview.
Vadim Zeitlin [Sun, 15 Jan 2012 23:28:54 +0000 (23:28 +0000)] 
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

12 years agoImplement IDocHostUIHandler in wxWebViewIE to improve the default behaviour. Disable...
Steve Lamerton [Sun, 15 Jan 2012 19:19:00 +0000 (19:19 +0000)] 
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

12 years agoAdd wxActiveXContainer::QueryClientSiteInterface to allow customisation of ActiveX...
Steve Lamerton [Sun, 15 Jan 2012 19:05:34 +0000 (19:05 +0000)] 
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

12 years agoFix minor errors in XRC format overview.
Vadim Zeitlin [Sun, 15 Jan 2012 18:54:27 +0000 (18:54 +0000)] 
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

12 years agoRemove __WXMGL__ tests from the samples too.
Vadim Zeitlin [Sun, 15 Jan 2012 18:50:35 +0000 (18:50 +0000)] 
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

12 years agoAdded min and max size to box attributes; made property editing more customisable
Julian Smart [Sun, 15 Jan 2012 18:26:58 +0000 (18:26 +0000)] 
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

12 years agoDon't crash if XRC file contains '_' at the end of a string.
Václav Slavík [Sun, 15 Jan 2012 17:45:14 +0000 (17:45 +0000)] 
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

12 years agonative maxlength support, fixes #10269 (for osx_cocoa)
Stefan Csomor [Sun, 15 Jan 2012 15:55:58 +0000 (15:55 +0000)] 
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

12 years agoremoving duplicated method, wiring native maxlength support, see #10269
Stefan Csomor [Sun, 15 Jan 2012 15:54:53 +0000 (15:54 +0000)] 
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

12 years agoallow native max length support, see #10269
Stefan Csomor [Sun, 15 Jan 2012 15:53:56 +0000 (15:53 +0000)] 
allow native max length support, see #10269

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoRemove wxMGL port.
Vadim Zeitlin [Sun, 15 Jan 2012 14:46:41 +0000 (14:46 +0000)] 
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

12 years agoRemove empty PalmOS-related directories.
Vadim Zeitlin [Sun, 15 Jan 2012 13:46:35 +0000 (13:46 +0000)] 
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

12 years agoRemove more Palm OS left overs.
Vadim Zeitlin [Sun, 15 Jan 2012 13:43:19 +0000 (13:43 +0000)] 
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

12 years agoImplement wxMenuBar::EnableTop() for wxMSW and wxGTK.
Vadim Zeitlin [Sun, 15 Jan 2012 13:41:17 +0000 (13:41 +0000)] 
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

12 years agoFix unit test build with wxUSE_ZIPSTREAM or wxUSE_TARSTREAM == 0.
Vadim Zeitlin [Sun, 15 Jan 2012 12:28:57 +0000 (12:28 +0000)] 
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

12 years agoFix variable name in wxFTP example in the documentation.
Vadim Zeitlin [Sun, 15 Jan 2012 12:28:54 +0000 (12:28 +0000)] 
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

12 years agoDocument wxFileCtrl as being in the core library, not in the base one.
Vadim Zeitlin [Sun, 15 Jan 2012 12:28:50 +0000 (12:28 +0000)] 
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

12 years agopatch applied with thanks, fixes #13865
Stefan Csomor [Sun, 15 Jan 2012 11:18:25 +0000 (11:18 +0000)] 
patch applied with thanks, fixes #13865

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

12 years agoRemove Palm OS port.
Vadim Zeitlin [Sun, 15 Jan 2012 01:05:28 +0000 (01:05 +0000)] 
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

12 years agoRemove the documentation of non-existent wxNO_T macro.
Vadim Zeitlin [Sun, 15 Jan 2012 01:05:07 +0000 (01:05 +0000)] 
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

12 years agoCorrect wrong checks for wxUSE_OWNER_DRAWN.
Vadim Zeitlin [Sun, 15 Jan 2012 01:01:44 +0000 (01:01 +0000)] 
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