]> git.saurik.com Git - wxWidgets.git/log
wxWidgets.git
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

12 years agoin addition to key events, also prevent unhandled mouse events from propagating up...
Paul Cornett [Sat, 14 Jan 2012 19:54:50 +0000 (19:54 +0000)] 
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

12 years agoFix the size of the font returned from wxTextCtrl::GetStyle() in wxMSW.
Vadim Zeitlin [Sat, 14 Jan 2012 17:57:11 +0000 (17:57 +0000)] 
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

12 years agoUpdate wxNotebook selection when user changes the page in wxOSX.
Vadim Zeitlin [Sat, 14 Jan 2012 17:57:08 +0000 (17:57 +0000)] 
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

12 years agoFix wxDataViewCtrl::GetMainWindow() signature on OS X.
Václav Slavík [Sat, 14 Jan 2012 16:52:01 +0000 (16:52 +0000)] 
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

12 years agoMake column width calculations in wxDataViewCtrl and wxHeaderCtrl consistent.
Václav Slavík [Sat, 14 Jan 2012 16:51:57 +0000 (16:51 +0000)] 
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

12 years agoadd post-commit to svn too
Robin Dunn [Fri, 13 Jan 2012 19:03:41 +0000 (19:03 +0000)] 
add post-commit to svn too

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

12 years agoAlso exclude generated wxPython html files from pre-commit checks
Robin Dunn [Fri, 13 Jan 2012 18:57:57 +0000 (18:57 +0000)] 
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

12 years agoCall tzset() for all compilers before using time zone variable.
Vadim Zeitlin [Fri, 13 Jan 2012 11:36:33 +0000 (11:36 +0000)] 
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

12 years agoCorrect handle passed to DocumentProperties() in MSW printing code.
Vadim Zeitlin [Fri, 13 Jan 2012 11:32:44 +0000 (11:32 +0000)] 
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

12 years agoUpdate broken link to manifest documentation on MSDN.
Vadim Zeitlin [Fri, 13 Jan 2012 11:29:33 +0000 (11:29 +0000)] 
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

12 years agoUpdate makefiles for OpenVMS
Jouk Jansen [Fri, 13 Jan 2012 08:00:48 +0000 (08:00 +0000)] 
Update makefiles for OpenVMS

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

12 years agoCorrect wxDropSource constructors documentation.
Vadim Zeitlin [Thu, 12 Jan 2012 18:15:12 +0000 (18:15 +0000)] 
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

12 years agorevert r70315, key event propagation should be fixed by r70324
Paul Cornett [Thu, 12 Jan 2012 18:06:32 +0000 (18:06 +0000)] 
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

12 years agoprevent unhandled key events from propagating up parent chain
Paul Cornett [Thu, 12 Jan 2012 18:06:07 +0000 (18:06 +0000)] 
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

12 years agoAdded Lithuanian translations.
Vadim Zeitlin [Thu, 12 Jan 2012 14:19:50 +0000 (14:19 +0000)] 
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

12 years agoAdd missing aui dependencies to the notebook sample.
Steve Lamerton [Thu, 12 Jan 2012 10:26:51 +0000 (10:26 +0000)] 
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

12 years agoDon't react to Enter/Space/F2 with modifiers in generic wxDataViewCtrl.
Václav Slavík [Wed, 11 Jan 2012 13:42:53 +0000 (13:42 +0000)] 
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

12 years agoOnly declare wxDialog::SetWindowStyleFlag() when wxUSE_DIALOG_SIZEGRIP.
Vadim Zeitlin [Wed, 11 Jan 2012 13:42:06 +0000 (13:42 +0000)] 
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

12 years agoAdd wxUSE_OWNER_DRAW checks to wxMSW wxMenu code.
Vadim Zeitlin [Wed, 11 Jan 2012 13:42:02 +0000 (13:42 +0000)] 
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

12 years agoFix UI in generic wxListCtrl when pressing cursor arrows while editing.
Vadim Zeitlin [Tue, 10 Jan 2012 23:11:39 +0000 (23:11 +0000)] 
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

12 years agoFixed clicking on MSW slider not changing value with small ranges.
Dimitri Schoolwerth [Tue, 10 Jan 2012 17:09:11 +0000 (17:09 +0000)] 
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

12 years agoFix wxFrame::AttachMenuBar() compilation under Windows CE.
Vadim Zeitlin [Tue, 10 Jan 2012 17:01:20 +0000 (17:01 +0000)] 
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

12 years agoUse wxAbort() instead of abort() to fix Windows CE build.
Vadim Zeitlin [Tue, 10 Jan 2012 17:01:17 +0000 (17:01 +0000)] 
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

12 years agoAdded wxAbort() which can also be used under Windows CE.
Vadim Zeitlin [Tue, 10 Jan 2012 17:01:13 +0000 (17:01 +0000)] 
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

12 years agoAdd missing wxUSE_TOOLTIPS and wxUSE_UXTHEME checks to wxMSW.
Vadim Zeitlin [Tue, 10 Jan 2012 17:01:09 +0000 (17:01 +0000)] 
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

12 years agoDon't crash in generic wxDataViewCtrl if selected column is removed.
Václav Slavík [Mon, 9 Jan 2012 18:59:23 +0000 (18:59 +0000)] 
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

12 years agoAdd check for _T() to svn pre-commit hook.
Vadim Zeitlin [Mon, 9 Jan 2012 18:48:42 +0000 (18:48 +0000)] 
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

12 years agoUse wxT() instead of _T() in XTI code.
Vadim Zeitlin [Mon, 9 Jan 2012 18:48:39 +0000 (18:48 +0000)] 
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

12 years agoUse wxT(), not _T(), in wxRichText code.
Vadim Zeitlin [Mon, 9 Jan 2012 18:48:36 +0000 (18:48 +0000)] 
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

12 years agoResolve ambiguity between two wxAuiNotebook overloads.
Vadim Zeitlin [Mon, 9 Jan 2012 18:48:34 +0000 (18:48 +0000)] 
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

12 years agoImproved layout, in particular passed a container size in order to allow relative...
Julian Smart [Mon, 9 Jan 2012 14:19:50 +0000 (14:19 +0000)] 
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

12 years agono code changes, fixed some typos
Dimitri Schoolwerth [Mon, 9 Jan 2012 14:04:25 +0000 (14:04 +0000)] 
no code changes, fixed some typos

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

12 years agoCorrection for the #define wxUSE_DRAG_AND_DROP 0 case
Jouk Jansen [Mon, 9 Jan 2012 07:18:19 +0000 (07:18 +0000)] 
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

12 years agomove render params out of wxDataViewCustomRenderer
Paul Cornett [Mon, 9 Jan 2012 06:31:07 +0000 (06:31 +0000)] 
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

12 years agoFixed default style setting to take into account text boxes; fixed AddBoxStyle
Julian Smart [Sun, 8 Jan 2012 18:27:47 +0000 (18:27 +0000)] 
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

12 years agoFix menu creation in wxOSX/Carbon when using wx in a plugin.
Vadim Zeitlin [Sun, 8 Jan 2012 14:52:59 +0000 (14:52 +0000)] 
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

12 years agoEnhance wxRibbonToolBar functionality to wxRibbonButtonBar level.
Vadim Zeitlin [Sun, 8 Jan 2012 14:52:56 +0000 (14:52 +0000)] 
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

12 years agoDon't generate drag events without valid item in wxGenericListCtrl.
Vadim Zeitlin [Sun, 8 Jan 2012 14:52:51 +0000 (14:52 +0000)] 
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

12 years agoAdd wxTopLevelWindow::SetRepresentedFilename().
Vadim Zeitlin [Sun, 8 Jan 2012 14:52:47 +0000 (14:52 +0000)] 
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

12 years agoAnother wxOSX/Carbon compilation fix after wxListCtrlBase changes.
Vadim Zeitlin [Sun, 8 Jan 2012 10:54:28 +0000 (10:54 +0000)] 
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

12 years agouse correct signature for init functions
Paul Cornett [Sun, 8 Jan 2012 07:12:35 +0000 (07:12 +0000)] 
use correct signature for init functions

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

12 years agoremove unnecessary class definitions and variables
Paul Cornett [Sun, 8 Jan 2012 06:40:26 +0000 (06:40 +0000)] 
remove unnecessary class definitions and variables

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

12 years agoremove unnecessary finalize overrides
Paul Cornett [Sun, 8 Jan 2012 06:30:55 +0000 (06:30 +0000)] 
remove unnecessary finalize overrides

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

12 years agoFix wxOSX/Carbon compilation after wxListCtrlBase introduction.
Vadim Zeitlin [Sun, 8 Jan 2012 00:55:22 +0000 (00:55 +0000)] 
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

12 years agoCompilation fixes to joystick sample after r70279.
Vadim Zeitlin [Sat, 7 Jan 2012 16:35:02 +0000 (16:35 +0000)] 
Compilation fixes to joystick sample after r70279.

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

12 years agoCompilation fix for PCH-less build after wxListCtrlBase changes.
Vadim Zeitlin [Sat, 7 Jan 2012 16:11:10 +0000 (16:11 +0000)] 
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

12 years agoImprove column auto-sizing code in generic wxListCtrl.
Vadim Zeitlin [Sat, 7 Jan 2012 15:09:54 +0000 (15:09 +0000)] 
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

12 years agoAdd support for wxLIST_AUTOSIZE_USEHEADER to InsertColumn().
Vadim Zeitlin [Sat, 7 Jan 2012 15:09:51 +0000 (15:09 +0000)] 
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

12 years agoAdd convenient wxListCtrl::AppendColumn() wrapper.
Vadim Zeitlin [Sat, 7 Jan 2012 15:09:47 +0000 (15:09 +0000)] 
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

12 years agoImplement best size calculation for report mode wxListCtrl.
Vadim Zeitlin [Sat, 7 Jan 2012 15:09:43 +0000 (15:09 +0000)] 
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

12 years agoReplace 3 copies of wxListCtrl mode tests with a single one in wxListCtrlBase.
Vadim Zeitlin [Sat, 7 Jan 2012 15:09:37 +0000 (15:09 +0000)] 
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

12 years agoAdd wxListCtrlBase common base class for port-specific wxListCtrl.
Vadim Zeitlin [Sat, 7 Jan 2012 15:09:34 +0000 (15:09 +0000)] 
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

12 years agoSet Z-position correctly for wxEVT_JOY_ZMOVE events.
Vadim Zeitlin [Sat, 7 Jan 2012 15:09:29 +0000 (15:09 +0000)] 
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

12 years agoJoystick messages coordinates are unsigned, treat them as such.
Vadim Zeitlin [Sat, 7 Jan 2012 15:09:24 +0000 (15:09 +0000)] 
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

12 years agoRemoved compilation ambiguity between different forms of ...WithUndo functions.
Julian Smart [Thu, 5 Jan 2012 15:48:21 +0000 (15:48 +0000)] 
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

12 years agoFixed box style application.
Julian Smart [Thu, 5 Jan 2012 14:10:24 +0000 (14:10 +0000)] 
Fixed box style application.

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

12 years agoFixed #13833: wxRichTextCtrl: 'Copy' can grab an extra character
Julian Smart [Thu, 5 Jan 2012 14:08:52 +0000 (14:08 +0000)] 
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

12 years agoEnsure that wxListEvent::m_itemIndex and m_item.m_itemId are in sync.
Vadim Zeitlin [Thu, 5 Jan 2012 12:51:42 +0000 (12:51 +0000)] 
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

12 years agoDon't fill wxListEvent::m_item when using virtual list control in wxMSW.
Vadim Zeitlin [Thu, 5 Jan 2012 12:51:40 +0000 (12:51 +0000)] 
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

12 years agoInitialize wxListItem::m_itemId to -1, not 0.
Vadim Zeitlin [Thu, 5 Jan 2012 12:51:37 +0000 (12:51 +0000)] 
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

12 years agoFix wxDateTime unit test compilation without PCH.
Vadim Zeitlin [Thu, 5 Jan 2012 10:21:46 +0000 (10:21 +0000)] 
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

12 years agoImplement support for "%z" in wxDateTime::Format() and Parse().
Vadim Zeitlin [Thu, 5 Jan 2012 00:47:10 +0000 (00:47 +0000)] 
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

12 years agoAdded box style functionality to style manager dialog
Julian Smart [Wed, 4 Jan 2012 19:38:31 +0000 (19:38 +0000)] 
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

12 years agoImplement missing wxTextBoxAttr::IsDefault function
Julian Smart [Wed, 4 Jan 2012 16:32:08 +0000 (16:32 +0000)] 
Implement missing wxTextBoxAttr::IsDefault function

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

12 years agoMore pt_BR translations from Felipe.
Vadim Zeitlin [Wed, 4 Jan 2012 15:53:08 +0000 (15:53 +0000)] 
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