]> git.saurik.com Git - wxWidgets.git/log
wxWidgets.git
13 years agoRename lineAnchor in Scintilla code to avoid shadowing warning.
Vadim Zeitlin [Sat, 5 Nov 2011 10:28:48 +0000 (10:28 +0000)] 
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

13 years agoCorrect the misleading example of using id ranges in XRC documentation.
Vadim Zeitlin [Fri, 4 Nov 2011 17:41:20 +0000 (17:41 +0000)] 
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

13 years agoSimplify wxIdRange code by using new XRCID_Assign() function.
Vadim Zeitlin [Fri, 4 Nov 2011 17:40:49 +0000 (17:40 +0000)] 
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

13 years agoFix choice of tree item icon for the selected state in wxMSW.
Vadim Zeitlin [Fri, 4 Nov 2011 12:02:07 +0000 (12:02 +0000)] 
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

13 years agoMake wxQsort() definition exactly the same as declaration.
Vadim Zeitlin [Fri, 4 Nov 2011 09:09:54 +0000 (09:09 +0000)] 
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

13 years agoAdd wxAnyButton so the shared class hierarchy of wxButton and wxToggleButton is accurate.
Robin Dunn [Fri, 4 Nov 2011 03:38:09 +0000 (03:38 +0000)] 
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

13 years agoFix missing and broken interface items for Phoenix
Robin Dunn [Fri, 4 Nov 2011 01:33:37 +0000 (01:33 +0000)] 
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

13 years agoUpadte setup for OpenVMS
Jouk Jansen [Thu, 3 Nov 2011 09:38:44 +0000 (09:38 +0000)] 
Upadte setup for OpenVMS

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

13 years agoFix missing or broken interface items for Phoenix
Robin Dunn [Wed, 2 Nov 2011 23:42:26 +0000 (23:42 +0000)] 
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

13 years agoFix missing or broken interface items for Phoenix
Robin Dunn [Wed, 2 Nov 2011 20:22:29 +0000 (20:22 +0000)] 
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

13 years agoImprovements to German translation.
Vadim Zeitlin [Wed, 2 Nov 2011 19:08:54 +0000 (19:08 +0000)] 
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

13 years agoOrthographical fixes in German translation.
Vadim Zeitlin [Wed, 2 Nov 2011 19:08:51 +0000 (19:08 +0000)] 
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

13 years agoHyphen fixes in German translation.
Vadim Zeitlin [Wed, 2 Nov 2011 19:08:49 +0000 (19:08 +0000)] 
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

13 years agoPunctuation fixes in German translation.
Vadim Zeitlin [Wed, 2 Nov 2011 19:08:46 +0000 (19:08 +0000)] 
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

13 years agoCorrections to spaces in German translation.
Vadim Zeitlin [Wed, 2 Nov 2011 19:08:43 +0000 (19:08 +0000)] 
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

13 years agoExplicitly include X11/Xlib.h to fix AIX build.
Vadim Zeitlin [Tue, 1 Nov 2011 12:04:27 +0000 (12:04 +0000)] 
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

13 years agoDefine _LINUX_SOURCE_COMPAT for AIX build.
Vadim Zeitlin [Tue, 1 Nov 2011 12:04:24 +0000 (12:04 +0000)] 
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

13 years agoMake wxTreeListEvent dynamically creatable.
Vadim Zeitlin [Mon, 31 Oct 2011 19:41:06 +0000 (19:41 +0000)] 
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

13 years agoCorrect wxFileName::SetPath() documentation.
Vadim Zeitlin [Mon, 31 Oct 2011 19:33:43 +0000 (19:33 +0000)] 
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

13 years agofix creation of bitmap from image with requested depth 32
Paul Cornett [Mon, 31 Oct 2011 16:09:47 +0000 (16:09 +0000)] 
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

13 years agoSuppress harmless unused variable warnings in wxSocket under AIX.
Vadim Zeitlin [Mon, 31 Oct 2011 14:24:54 +0000 (14:24 +0000)] 
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

13 years agoFix compilation of wxGethostbyname_r() and wxGethostbyaddr_r() under AIX.
Vadim Zeitlin [Mon, 31 Oct 2011 14:24:51 +0000 (14:24 +0000)] 
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

13 years agoCompilation fix for AIX: fix the name of wxGetservBuf ctor.
Vadim Zeitlin [Mon, 31 Oct 2011 14:24:49 +0000 (14:24 +0000)] 
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

13 years agoFixed #13535: wxRichTextCtrl: Incorrectly documented or named functions
Julian Smart [Mon, 31 Oct 2011 12:15:05 +0000 (12:15 +0000)] 
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

13 years agoFixed dropdown height of wxChoice and wxComboBox controls.
Dimitri Schoolwerth [Mon, 31 Oct 2011 11:30:45 +0000 (11:30 +0000)] 
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

13 years agoMention setting up file as default download on SF in release docs.
Vadim Zeitlin [Mon, 31 Oct 2011 10:49:52 +0000 (10:49 +0000)] 
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

13 years agoCompilation fix for wxUSE_GRAPHICS_CONTEXT && !WX_PRECOMP.
Vadim Zeitlin [Mon, 31 Oct 2011 10:42:42 +0000 (10:42 +0000)] 
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

13 years agoCorrect FSF postal address in the licence text.
Vadim Zeitlin [Mon, 31 Oct 2011 10:40:52 +0000 (10:40 +0000)] 
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

13 years agoRemove duplicated and apparently unnecessary licence file.
Vadim Zeitlin [Mon, 31 Oct 2011 10:40:50 +0000 (10:40 +0000)] 
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

13 years agoadd gdk_window_get_height/width
Paul Cornett [Mon, 31 Oct 2011 05:42:10 +0000 (05:42 +0000)] 
add gdk_window_get_height/width

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

13 years agosimplify Refresh(), ancestors of a mapped window have to be mapped also, no point...
Paul Cornett [Mon, 31 Oct 2011 05:36:51 +0000 (05:36 +0000)] 
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

13 years agoin DoSetSize, only call GetPosition if necessary
Paul Cornett [Mon, 31 Oct 2011 05:22:59 +0000 (05:22 +0000)] 
in DoSetSize, only call GetPosition if necessary

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

13 years agocorrect callback function signature
Paul Cornett [Mon, 31 Oct 2011 05:15:04 +0000 (05:15 +0000)] 
correct callback function signature

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

13 years agomove class function out of extern "C" block
Paul Cornett [Mon, 31 Oct 2011 05:14:13 +0000 (05:14 +0000)] 
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

13 years agosimplify code calling gtk_window_set_urgency_hint
Paul Cornett [Mon, 31 Oct 2011 04:35:56 +0000 (04:35 +0000)] 
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

13 years agoAvoid too many sash position changed events when splitter is resized.
Vadim Zeitlin [Sun, 30 Oct 2011 19:48:50 +0000 (19:48 +0000)] 
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

13 years agoFix the check for second window becoming too small in wxSplitterWindow.
Vadim Zeitlin [Sun, 30 Oct 2011 19:48:48 +0000 (19:48 +0000)] 
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

13 years agoMake the initial sash position work in splitter sample.
Vadim Zeitlin [Sun, 30 Oct 2011 19:48:44 +0000 (19:48 +0000)] 
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

13 years agoDon't apply gravity before requested sash position was set in wxSplitterWindow.
Vadim Zeitlin [Sun, 30 Oct 2011 19:48:40 +0000 (19:48 +0000)] 
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

13 years agoRemove wxSplitterWindow::m_checkRequestedSashPosition.
Vadim Zeitlin [Sun, 30 Oct 2011 19:48:38 +0000 (19:48 +0000)] 
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

13 years agoNo changes, just remove wxSplitterWindow::{Set,Get}NeedUpdating().
Vadim Zeitlin [Sun, 30 Oct 2011 19:48:34 +0000 (19:48 +0000)] 
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

13 years agoFixed problem with the size of paragraphs not needing layout not being taken into...
Julian Smart [Sun, 30 Oct 2011 17:28:03 +0000 (17:28 +0000)] 
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

13 years agoPerform wxAuiToolBar idle updates from UpdateWindowUI(), not OnIdle().
Vadim Zeitlin [Sun, 30 Oct 2011 16:51:10 +0000 (16:51 +0000)] 
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

13 years agoGenerate right click events for all kinds of items in wxAuiToolBar.
Vadim Zeitlin [Sun, 30 Oct 2011 16:44:24 +0000 (16:44 +0000)] 
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

13 years agoFix splitting message into title in body in MSW wxProgressDialog.
Vadim Zeitlin [Sun, 30 Oct 2011 16:41:34 +0000 (16:41 +0000)] 
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

13 years agoDon't replace non default wxMessageDialog labels with default translations.
Vadim Zeitlin [Sun, 30 Oct 2011 16:22:30 +0000 (16:22 +0000)] 
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

13 years agoChange variables naming convention in wxAUI code.
Vadim Zeitlin [Sun, 30 Oct 2011 14:20:03 +0000 (14:20 +0000)] 
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

13 years agoLink tests with webview library only if it is actually available.
Vadim Zeitlin [Sun, 30 Oct 2011 14:19:59 +0000 (14:19 +0000)] 
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

13 years agoRemove apparently unnecessary wxAuiMDIClientWindow dtor.
Vadim Zeitlin [Sun, 30 Oct 2011 14:19:55 +0000 (14:19 +0000)] 
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

13 years agoAdd wx/datetimectrl.h to the wxAdv files list.
Vadim Zeitlin [Sun, 30 Oct 2011 14:19:51 +0000 (14:19 +0000)] 
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

13 years agoFix assert in generic wxListCtrl icon view when using images.
Vadim Zeitlin [Sun, 30 Oct 2011 14:19:47 +0000 (14:19 +0000)] 
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

13 years agoFixed warning when compiling richttextctrl.cpp in VS2010 (fixes #13606)
Julian Smart [Sun, 30 Oct 2011 13:39:11 +0000 (13:39 +0000)] 
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

13 years agoAdd indents to maximum size to prevent problems with paragraph layout (fixes #13458).
Julian Smart [Sun, 30 Oct 2011 13:34:43 +0000 (13:34 +0000)] 
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

13 years agoAllow customization of the locations where persistent settings are stored.
Vadim Zeitlin [Sun, 30 Oct 2011 10:08:18 +0000 (10:08 +0000)] 
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

13 years agoFix return value of wxPersistentSplitter::RestoreValue().
Vadim Zeitlin [Sun, 30 Oct 2011 10:08:14 +0000 (10:08 +0000)] 
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

13 years agoAdd missing interface items for Phoenix
Robin Dunn [Sat, 29 Oct 2011 21:34:49 +0000 (21:34 +0000)] 
Add missing interface items for Phoenix

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

13 years agoresolve multiple inheritance ambiguity
Robin Dunn [Sat, 29 Oct 2011 04:50:04 +0000 (04:50 +0000)] 
resolve multiple inheritance ambiguity

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

13 years agoparenthesize bitwise operator in logical expression
Paul Cornett [Sat, 29 Oct 2011 04:49:38 +0000 (04:49 +0000)] 
parenthesize bitwise operator in logical expression

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

13 years agoMake BOM-detection code in wxConvAuto public.
Vadim Zeitlin [Thu, 27 Oct 2011 22:48:54 +0000 (22:48 +0000)] 
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

13 years agoNo changes, just simplifications to configure code.
Vadim Zeitlin [Thu, 27 Oct 2011 22:48:50 +0000 (22:48 +0000)] 
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

13 years agoNo changes, just remove redundant code.
Vadim Zeitlin [Thu, 27 Oct 2011 22:48:46 +0000 (22:48 +0000)] 
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

13 years agoAdd _PTR WX_DECLARE_HASH_SET variants to fix warnings about operator->().
Vadim Zeitlin [Thu, 27 Oct 2011 22:26:10 +0000 (22:26 +0000)] 
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

13 years agoUse WX_XXX_ARRAY_PTR macro variants for arrays of pointers.
Vadim Zeitlin [Thu, 27 Oct 2011 21:10:51 +0000 (21:10 +0000)] 
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

13 years agoDon't make wxQsort() extern "C" nor use any special convention for it.
Vadim Zeitlin [Thu, 27 Oct 2011 21:10:48 +0000 (21:10 +0000)] 
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

13 years agoMake GTK callbacks passed to GTKConnectWidget() extern "C".
Vadim Zeitlin [Thu, 27 Oct 2011 21:10:45 +0000 (21:10 +0000)] 
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

13 years agoExplicitly declare environ variable.
Vadim Zeitlin [Thu, 27 Oct 2011 21:10:43 +0000 (21:10 +0000)] 
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

13 years agoAlways include locale.h to get LC_ALL declaration.
Vadim Zeitlin [Thu, 27 Oct 2011 21:10:40 +0000 (21:10 +0000)] 
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

13 years agoRemove unused wxIFFDecoder::picptr member variable.
Vadim Zeitlin [Thu, 27 Oct 2011 21:10:38 +0000 (21:10 +0000)] 
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

13 years agoNo real changes, just remove an extra semicolon.
Vadim Zeitlin [Thu, 27 Oct 2011 21:10:35 +0000 (21:10 +0000)] 
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

13 years agoReplace remaining occurrences of _T() with wxT().
Vadim Zeitlin [Thu, 27 Oct 2011 21:10:33 +0000 (21:10 +0000)] 
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

13 years agoNo real changes, just remove trailing commas from enums.
Vadim Zeitlin [Thu, 27 Oct 2011 21:10:30 +0000 (21:10 +0000)] 
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

13 years agoAdd WX_FIND_LIB() function to simplify testing for libraries in configure.
Vadim Zeitlin [Wed, 26 Oct 2011 23:20:19 +0000 (23:20 +0000)] 
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

13 years agoNo changes, just fix some typos in acinclude.m4 comments.
Vadim Zeitlin [Wed, 26 Oct 2011 23:20:13 +0000 (23:20 +0000)] 
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

13 years agoUse AC_LANG_SOURCE and add missing quoting to configure.
Vadim Zeitlin [Wed, 26 Oct 2011 23:20:10 +0000 (23:20 +0000)] 
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

13 years agoFix incorrect handling of ItemsAdded() in wxDataViewCtrl.
Václav Slavík [Wed, 26 Oct 2011 17:10:27 +0000 (17:10 +0000)] 
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

13 years agoInterface tweaks and fixes for Phoenix
Robin Dunn [Wed, 26 Oct 2011 05:52:53 +0000 (05:52 +0000)] 
Interface tweaks and fixes for Phoenix

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

13 years agoWork around a multiple inheritance ambiguity
Robin Dunn [Wed, 26 Oct 2011 05:39:18 +0000 (05:39 +0000)] 
Work around a multiple inheritance ambiguity

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

13 years agomove declaration into cocoa part
Stefan Csomor [Wed, 26 Oct 2011 05:38:24 +0000 (05:38 +0000)] 
move declaration into cocoa part

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

13 years agodeactivate wxUSE_TIMEPICKCTRL for iphone
Stefan Csomor [Tue, 25 Oct 2011 19:29:12 +0000 (19:29 +0000)] 
deactivate wxUSE_TIMEPICKCTRL for iphone

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

13 years agofiles added
Stefan Csomor [Tue, 25 Oct 2011 18:44:53 +0000 (18:44 +0000)] 
files added

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

13 years agofiles added
Stefan Csomor [Tue, 25 Oct 2011 18:31:02 +0000 (18:31 +0000)] 
files added

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

13 years agofiles added
Stefan Csomor [Tue, 25 Oct 2011 18:04:24 +0000 (18:04 +0000)] 
files added

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

13 years agofix wxMDIChildFrame after r69390 and r69468, TLW realization code should not be calle...
Paul Cornett [Tue, 25 Oct 2011 16:56:57 +0000 (16:56 +0000)] 
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

13 years agopanelg removal
Stefan Csomor [Tue, 25 Oct 2011 16:55:36 +0000 (16:55 +0000)] 
panelg removal

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

13 years agofixing reentrancy problem under iOS 5
Stefan Csomor [Tue, 25 Oct 2011 11:52:02 +0000 (11:52 +0000)] 
fixing reentrancy problem under iOS 5

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

13 years agofixing iPhone build
Stefan Csomor [Tue, 25 Oct 2011 11:51:36 +0000 (11:51 +0000)] 
fixing iPhone build

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

13 years agofixing iPhone build
Stefan Csomor [Tue, 25 Oct 2011 11:51:08 +0000 (11:51 +0000)] 
fixing iPhone build

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

13 years agoavoid GDK warning "drawable is not a pixmap or window"
Paul Cornett [Tue, 25 Oct 2011 06:00:24 +0000 (06:00 +0000)] 
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

13 years agoavoid GTK3 warning "GtkNotebook %p is mapped but visible child wxPizza %p is not...
Paul Cornett [Tue, 25 Oct 2011 05:12:14 +0000 (05:12 +0000)] 
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

13 years agorevert (presumably unintentional) change from r59562, which caused auto-scroll sample...
Paul Cornett [Sun, 23 Oct 2011 18:03:20 +0000 (18:03 +0000)] 
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

13 years agoFix for indeterminate attribute specification
Julian Smart [Sat, 22 Oct 2011 13:49:00 +0000 (13:49 +0000)] 
Fix for indeterminate attribute specification

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

13 years agoApplied patch #13534: wxRichTextCtrl: Make it easier to use TextEffects flags
Julian Smart [Sat, 22 Oct 2011 13:19:40 +0000 (13:19 +0000)] 
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

13 years agoAllow user to select indeterminate state for font attributes
Julian Smart [Sat, 22 Oct 2011 13:08:00 +0000 (13:08 +0000)] 
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

13 years agoAdd missing styles and flags, and specify pure virtuals that are implemented
Robin Dunn [Sat, 22 Oct 2011 02:31:03 +0000 (02:31 +0000)] 
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

13 years agoAdd the getters
Robin Dunn [Fri, 21 Oct 2011 18:34:20 +0000 (18:34 +0000)] 
Add the getters

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

13 years agoIt's not an array of pointers to dashes, but rather an array of dash values
Robin Dunn [Fri, 21 Oct 2011 18:33:51 +0000 (18:33 +0000)] 
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

13 years agoDocument wxDataViewModelNotifier callbacks return values.
Václav Slavík [Fri, 21 Oct 2011 16:51:00 +0000 (16:51 +0000)] 
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

13 years agoUse the new wxDataViewRenderer activation API in wxTreeListCtrl.
Václav Slavík [Fri, 21 Oct 2011 16:34:35 +0000 (16:34 +0000)] 
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

13 years agoMove wxDataViewCustomRendererBase::ActivateCell() to datavcmn.cpp.
Václav Slavík [Fri, 21 Oct 2011 16:34:32 +0000 (16:34 +0000)] 
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

13 years agoInterface fixes for Phoenix
Robin Dunn [Fri, 21 Oct 2011 07:56:01 +0000 (07:56 +0000)] 
Interface fixes for Phoenix

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