]> git.saurik.com Git - wxWidgets.git/log
wxWidgets.git
11 years agoUpdated the Latvian translation (Janis Eisaks)
Julian Smart [Thu, 24 Jan 2013 09:24:06 +0000 (09:24 +0000)] 
Updated the Latvian translation (Janis Eisaks)

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

11 years agoInitialize all wxHTTPStream members in ctor.
Vadim Zeitlin [Wed, 23 Jan 2013 11:44:30 +0000 (11:44 +0000)] 
Initialize all wxHTTPStream members in ctor.

Don't leave m_httpsize and m_read_bytes uninitialized.

Closes #14993.

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

11 years agoNo real changes, just fix some typos in comments in wxMSW code.
Vadim Zeitlin [Wed, 23 Jan 2013 11:44:26 +0000 (11:44 +0000)] 
No real changes, just fix some typos in comments in wxMSW code.

Closes #14994.

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

11 years agolet wxCheckListBox get the properties of wxCheckListBoxBase (was wxListBox) for wxGTK...
Jouk Jansen [Wed, 23 Jan 2013 10:15:15 +0000 (10:15 +0000)] 
let wxCheckListBox get the properties of wxCheckListBoxBase (was wxListBox) for wxGTK1, just like the other versions of wx

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

11 years agoUpdate openVMS compile support
Jouk Jansen [Tue, 22 Jan 2013 07:18:35 +0000 (07:18 +0000)] 
Update openVMS compile support

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

11 years agoFix background drawing in EVT_ERASE_BACKGROUND handler in erase sample.
Vadim Zeitlin [Mon, 21 Jan 2013 16:37:09 +0000 (16:37 +0000)] 
Fix background drawing in EVT_ERASE_BACKGROUND handler in erase sample.

Clear the DC before moving its offset to ensure that it's cleared entirely and
also draw the background using the virtual, not client, size.

See #14917.

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

11 years agoDon't include wxUniversal configurations in MSVC project files.
Vadim Zeitlin [Mon, 21 Jan 2013 16:37:01 +0000 (16:37 +0000)] 
Don't include wxUniversal configurations in MSVC project files.

wxUniversal is practically not used under MSW and just confuses people.

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

11 years agoFix a crash in wxExecute() in wxMSW too.
Vadim Zeitlin [Mon, 21 Jan 2013 11:28:50 +0000 (11:28 +0000)] 
Fix a crash in wxExecute() in wxMSW too.

Don't dereference potentially NULL wxProcess pointer unconditionally.

This should have been together with the changes of r73425, see #14931.

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

11 years agoFix crash in wxExecute() introduced by r73406.
Vadim Zeitlin [Mon, 21 Jan 2013 11:26:00 +0000 (11:26 +0000)] 
Fix crash in wxExecute() introduced by r73406.

Don't dereference potentially NULL wxProcess pointer.

See #14931.

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

11 years agoNo changes, just remove unused variable in wxCarbon code.
Vadim Zeitlin [Mon, 21 Jan 2013 11:19:04 +0000 (11:19 +0000)] 
No changes, just remove unused variable in wxCarbon code.

Closes #14989.

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

11 years agoAdd wxAUI_TB_PLAIN_BACKGROUND wxAuiToolBar style.
Vadim Zeitlin [Mon, 21 Jan 2013 11:19:00 +0000 (11:19 +0000)] 
Add wxAUI_TB_PLAIN_BACKGROUND wxAuiToolBar style.

This style allows to use a plain, solid colour, background instead of the
default gradient one.

Closes #10585.

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

11 years agoAdd wxCheckListBox::GetCheckedItems() helper.
Vadim Zeitlin [Mon, 21 Jan 2013 11:18:55 +0000 (11:18 +0000)] 
Add wxCheckListBox::GetCheckedItems() helper.

This method is similar to wxListBox::GetSelections() and allows to retrieve
all checked items at once.

Closes #14969.

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

11 years agoDerive wxCheckListBox from wxCheckListBoxBase in wxGTK.
Vadim Zeitlin [Mon, 21 Jan 2013 11:18:50 +0000 (11:18 +0000)] 
Derive wxCheckListBox from wxCheckListBoxBase in wxGTK.

This ensures that any methods defined in wxCheckListBoxBase will be available
in wxGTK wxCheckListBox too.

See #14969.

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

11 years agoOpenVMS configuration update
Jouk Jansen [Mon, 21 Jan 2013 11:11:55 +0000 (11:11 +0000)] 
OpenVMS configuration update

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

11 years agoOpenVMS compile support for wxSPLASH and sample
Jouk Jansen [Mon, 21 Jan 2013 11:04:40 +0000 (11:04 +0000)] 
OpenVMS compile support for wxSPLASH and sample

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

11 years agoupdated for 10.5 minimum
Stefan Csomor [Mon, 21 Jan 2013 08:26:55 +0000 (08:26 +0000)] 
updated for 10.5 minimum

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

11 years agoA fix for VC6 compilation: define missing priority constants.
Vadim Zeitlin [Sun, 20 Jan 2013 22:39:34 +0000 (22:39 +0000)] 
A fix for VC6 compilation: define missing priority constants.

{ABOVE,BELOW}_NORMAL_PRIORITY_CLASS aren ot defined in VC6 headers, see
http://buildbot.tt-solutions.com/wx/builders/XPSP2%20VC6%20wxMSW%20trunk%20release/builds/2943/steps/compile/logs/stdio
so define them ourselves.

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

11 years agoworkaround for crash, see #14906
Stefan Csomor [Sun, 20 Jan 2013 21:07:15 +0000 (21:07 +0000)] 
workaround for crash, see #14906

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

11 years agoPass wxWANTS_CHARS to the wxRichTextCtrl constructor in the unit tests.
Steve Lamerton [Sun, 20 Jan 2013 19:28:20 +0000 (19:28 +0000)] 
Pass wxWANTS_CHARS to the wxRichTextCtrl constructor in the unit tests.

Fixes test failures caused by the return key being used for dialog navigation.

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

11 years agoImprove appearance of text with background colour in wxHTML.
Vadim Zeitlin [Sun, 20 Jan 2013 12:53:22 +0000 (12:53 +0000)] 
Improve appearance of text with background colour in wxHTML.

Use wxHTML_CLR_TRANSPARENT_BACKGROUND instead of wxHTML_CLR_BACKGROUND for the
bgcolor attribute of the body tag to prevent clipping of the text cells by the
next cell with opaque background.

Closes #14986.

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

11 years agoFix wxKeyEvent::GetPosition() after the changes of r72207.
Vadim Zeitlin [Sun, 20 Jan 2013 12:45:52 +0000 (12:45 +0000)] 
Fix wxKeyEvent::GetPosition() after the changes of r72207.

Now that the position of wxKeyEvent is initialized on demand, don't use m_x
and m_y fields directly but always use GetX() and GetY().

Also improve GetPosition() documentation slightly and mention only the new
version, taking wxCoord, in it as the old one, taking long, is provided for
compatiblity only.

Closes #14987.

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

11 years agono real changes, just move wxMask::GetBitmap() to wxMask section
Paul Cornett [Sun, 20 Jan 2013 06:38:43 +0000 (06:38 +0000)] 
no real changes, just move wxMask::GetBitmap() to wxMask section

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

11 years agoadd wxMask::GetBitmap(), closes #9381
Paul Cornett [Sun, 20 Jan 2013 06:28:11 +0000 (06:28 +0000)] 
add wxMask::GetBitmap(), closes #9381

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

11 years agosilence GCC warning "base class ‘class wxEvtHandler’ should be explicitly initialized...
Paul Cornett [Sun, 20 Jan 2013 03:24:21 +0000 (03:24 +0000)] 
silence GCC warning "base class ‘class wxEvtHandler’ should be explicitly initialized in the copy constructor"

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

11 years agosizeof(char) is 1. By definition.
Paul Cornett [Sun, 20 Jan 2013 03:08:33 +0000 (03:08 +0000)] 
sizeof(char) is 1. By definition.

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

11 years agoAdd wxProcess::SetPriority() to allow setting the priority of child processes.
Vadim Zeitlin [Sun, 20 Jan 2013 02:10:12 +0000 (02:10 +0000)] 
Add wxProcess::SetPriority() to allow setting the priority of child processes.

This uses the same conventions as wxThread::SetPriority() but works on the
entire process.

Closes #14931.

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

11 years agoRename WXTHREAD_XXX_PRIORITY yo wxPRIORITY_XXX.
Vadim Zeitlin [Sun, 20 Jan 2013 02:10:07 +0000 (02:10 +0000)] 
Rename WXTHREAD_XXX_PRIORITY yo wxPRIORITY_XXX.

This will allow to reuse the same constants for the process priorities in an
upcoming commit.

See #14931.

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

11 years agoFix appearance of multiline wxCheckBox with non-standard colours in wxMSW.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:56 +0000 (02:09 +0000)] 
Fix appearance of multiline wxCheckBox with non-standard colours in wxMSW.

Owner-drawn checkbox (which is used when wxCheckBox colour is changed) didn't
center its label correctly and didn't right align it when using wxALIGN_RIGHT
style in focused state.

Closes #9628.

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

11 years agoAdd copy constructor to wxValidator.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:52 +0000 (02:09 +0000)] 
Add copy constructor to wxValidator.

It can be useful for implementing Clone() in the derived classes.

Closes #2146.

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

11 years agoFix wxDateTime::GetWeekOfYear() for the days in the last week of the year.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:48 +0000 (02:09 +0000)] 
Fix wxDateTime::GetWeekOfYear() for the days in the last week of the year.

The code took into account the possibility that the days in the beginning of
the year might belong to the last week of the previous year but not that the
days at the end of the year could belong to the first week of the next year.

Closes #14973.

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

11 years agoFix wxSearchCtrl::HasFocus() in the generic version.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:44 +0000 (02:09 +0000)] 
Fix wxSearchCtrl::HasFocus() in the generic version.

Override GetMainWindowOfCompositeControl() in the windows composing the
generic wxSearchCtrl to ensure that HasFocus() correctly returns true for the
entire control when any of them has focus.

Add a trivial unit test to check that this really works and facilitate adding
more tests for this class later.

Closes #14970.

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

11 years agoFix changing labels of menu items with bitmaps in wxMSW.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:39 +0000 (02:09 +0000)] 
Fix changing labels of menu items with bitmaps in wxMSW.

We need to call SetMenuItemInfo() from wxMenuItem::SetItemLabel() even for the
owner-drawn items, otherwise their width is not recomputed.

Closes #3897.

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

11 years agoFix bug with showing hidden wxGrid lines when resizing an adjacent one.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:35 +0000 (02:09 +0000)] 
Fix bug with showing hidden wxGrid lines when resizing an adjacent one.

Don't blindly assume that the previous line is big enough if the current one
isn't in wxGrid::PosToEdgeOfLine() (this assumption is wrong even without
taking hiding into account...).

Closes #14947.

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

11 years agoMake "More windows..." menu item in MDI "Window" menu work in wxMSW.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:31 +0000 (02:09 +0000)] 
Make "More windows..." menu item in MDI "Window" menu work in wxMSW.

Don't interpret the commands from this menu item as child window selection.

Closes #3295.

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

11 years agoPut "#if wxUSE_TOOLBAR" around a variable only used in this case.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:27 +0000 (02:09 +0000)] 
Put "#if wxUSE_TOOLBAR" around a variable only used in this case.

No real changes.

Closes #14957.

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

11 years agoFix the list markers in wxGridCellEditor::EndEdit() documentation.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:22 +0000 (02:09 +0000)] 
Fix the list markers in wxGridCellEditor::EndEdit() documentation.

Doxygen allows to use "-", "+" or "*" for the list items but not "#".

Closes #14955.

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

11 years ago64 bit compilation fix for wxTextCtrl in wxMSW.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:18 +0000 (02:09 +0000)] 
64 bit compilation fix for wxTextCtrl in wxMSW.

Use DWORD_PTR instead of DWORD for a pointer.

This was already done for another occurrence of the same cast in r58564 but
somehow this one fell through the cracks.

Close #14949.

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

11 years agoFix setting initial wxSpinCtrl value outside 0..100 range in wxMSW.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:14 +0000 (02:09 +0000)] 
Fix setting initial wxSpinCtrl value outside 0..100 range in wxMSW.

Set the range before setting the initial value when creating wxSpinCtrl, as
otherwise the value was wrongly limited to the default 0..100 range instead of
the one really specified.

Closes #14894.

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

11 years agoReally fix the background colour used for the cells in wxHTML tables.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:09 +0000 (02:09 +0000)] 
Really fix the background colour used for the cells in wxHTML tables.

Respect "bgcolor" attributes of <td> tags, they were ignored since the changes
of r72589 (see #14443).

Closes #14909.

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

11 years agoDon't use margins for wxGrid in place text editor controls.
Vadim Zeitlin [Sun, 20 Jan 2013 02:09:05 +0000 (02:09 +0000)] 
Don't use margins for wxGrid in place text editor controls.

The default non-zero (at least under MSW) margins don't look well inside
wxGrid, don't waste space on them.

See #14958.

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

11 years agoSet margins on creation correctly for wxTE_RICH[2] wxTextCtrl in wxMSW.
Vadim Zeitlin [Sun, 20 Jan 2013 02:08:59 +0000 (02:08 +0000)] 
Set margins on creation correctly for wxTE_RICH[2] wxTextCtrl in wxMSW.

In spite of the MSDN documentation, EC_USEFONTINFO can't be used in lParam
with rich edit controls, so pass it in wParam for them.

Closes #14598.

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

11 years agoSet both left and right wxTextEntry margins in wxMSW.
Vadim Zeitlin [Sun, 20 Jan 2013 02:08:55 +0000 (02:08 +0000)] 
Set both left and right wxTextEntry margins in wxMSW.

Use the horizontal margin argument of SetMargins() to set both left and right
margins in wxMSW and not just the left one.

See #14958.

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

11 years agoFix bug with dragging non-draggable columns in wxMSW wxHeaderCtrl.
Vadim Zeitlin [Sun, 20 Jan 2013 02:08:51 +0000 (02:08 +0000)] 
Fix bug with dragging non-draggable columns in wxMSW wxHeaderCtrl.

Properly ignore HDN_BEGINDRAG events for the columns without wxCOL_REORDERABLE
flag. This fixes dragging non-draggable columns in wxDataViewCtrl under MSW.

Closes #14940.

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

11 years agoFix some harmless but annoying warnings about casts in libtiff code.
Vadim Zeitlin [Sun, 20 Jan 2013 02:08:46 +0000 (02:08 +0000)] 
Fix some harmless but annoying warnings about casts in libtiff code.

Avoid MSVC C4244 warnings due to implicit casts between 64 and 32 bit
integers.

This patch was also submitted to libtiff via

http://bugzilla.maptools.org/show_bug.cgi?id=2427

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

11 years agodraw monochrome source directly onto destination when it is also monochrome
Paul Cornett [Sun, 20 Jan 2013 02:04:57 +0000 (02:04 +0000)] 
draw monochrome source directly onto destination when it is also monochrome

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

11 years agomake some reference handling a little more direct and less obscure
Paul Cornett [Sun, 20 Jan 2013 01:46:50 +0000 (01:46 +0000)] 
make some reference handling a little more direct and less obscure

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

11 years agoWhen selecting the bitmap bullet style, the name can now be edited since it could...
Julian Smart [Sat, 19 Jan 2013 18:26:13 +0000 (18:26 +0000)] 
When selecting the bitmap bullet style, the name can now be edited since it could be used
for providing the bullet image.

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

11 years agouse const arrays for wxDC array parameters, closes #10712
Paul Cornett [Fri, 18 Jan 2013 17:27:51 +0000 (17:27 +0000)] 
use const arrays for wxDC array parameters, closes #10712

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

11 years agoWhen handling accelerators in wxWebView make sure that we do not block right-alt...
Steve Lamerton [Thu, 17 Jan 2013 09:57:37 +0000 (09:57 +0000)] 
When handling accelerators in wxWebView make sure that we do not block right-alt which can be mapped to alt + ctrl.

Fixes #14974.

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

11 years agoFix wrong value
Julian Smart [Wed, 16 Jan 2013 15:39:10 +0000 (15:39 +0000)] 
Fix wrong value

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

11 years agoBetter compatibility with old files when creating an image cache
Julian Smart [Wed, 16 Jan 2013 09:35:33 +0000 (09:35 +0000)] 
Better compatibility with old files when creating an image cache

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

11 years agoadd support for GtkFontChooserDialog, new in GTK 3.2
Paul Cornett [Tue, 15 Jan 2013 05:55:15 +0000 (05:55 +0000)] 
add support for GtkFontChooserDialog, new in GTK 3.2

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

11 years agoAdded Set/GetFloatingLayoutMode to switch off time-consuming floating object layout...
Julian Smart [Mon, 14 Jan 2013 16:19:45 +0000 (16:19 +0000)] 
Added Set/GetFloatingLayoutMode to switch off time-consuming floating object layout if required

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

11 years agoenum wxWebViewBackend has been removed.
Robin Dunn [Mon, 14 Jan 2013 16:08:21 +0000 (16:08 +0000)] 
enum wxWebViewBackend has been removed.

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

11 years agoAllow registering of custom wxWebView backends.
Steve Lamerton [Sun, 13 Jan 2013 19:22:24 +0000 (19:22 +0000)] 
Allow registering of custom wxWebView backends.

Add wxWebViewFactory as an abstract factory to provide backend creation. Remove old factory methods using wxWebViewBackend enum in favour of the new wxString based method.

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

11 years agoFix wrong return value in the changes of r73365.
Vadim Zeitlin [Sun, 13 Jan 2013 15:28:25 +0000 (15:28 +0000)] 
Fix wrong return value in the changes of r73365.

Really fix menus under Unity.

Closes #14961.

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

11 years agoFix compilation without PCH after r73365.
Vadim Zeitlin [Sat, 12 Jan 2013 12:03:37 +0000 (12:03 +0000)] 
Fix compilation without PCH after r73365.

Need to explicitly include wx/dialog.h to use wxDynamicCast to wxDialog.

See #14961.

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

11 years agoAllow hiding/showing already hidden/shown wxGrid rows/columns.
Vadim Zeitlin [Sat, 12 Jan 2013 03:09:12 +0000 (03:09 +0000)] 
Allow hiding/showing already hidden/shown wxGrid rows/columns.

Don't assert if an already hidden/shown row/column is being hidden/shown again
but simply don't do anything. This is more convenient because the code outside
wxGrid has no efficient way to only hide a row/column if it's currently shown.

Closes #14960.

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

11 years agoRelax Unity menu interdiction hack to allow popup menus in modal dialogs.
Vadim Zeitlin [Sat, 12 Jan 2013 03:09:06 +0000 (03:09 +0000)] 
Relax Unity menu interdiction hack to allow popup menus in modal dialogs.

The changes of r73007 fixed the problem with menus remaining active while a
modal dialog was shown (see #14823) but also disabled processing of the events
from any popup menus shown by the dialog itself. Reallow the latter while
still forbidding the former now by checking whether the window associated with
the menu is the dialog itself.

Closes #14961.

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

11 years agoFix a typo in wxKeyEvent::GetKeyCode() code example.
Vadim Zeitlin [Thu, 10 Jan 2013 17:59:13 +0000 (17:59 +0000)] 
Fix a typo in wxKeyEvent::GetKeyCode() code example.

Add missing object to the method call.

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

11 years agocall GTKApplyWidgetStyle() from PostCreation() instead of GTKHandleRealized()
Paul Cornett [Thu, 10 Jan 2013 07:17:01 +0000 (07:17 +0000)] 
call GTKApplyWidgetStyle() from PostCreation() instead of GTKHandleRealized()
it's a better place to catch font or color changes made before creation

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

11 years agoallow setting window font and bg/fg color before creation
Paul Cornett [Thu, 10 Jan 2013 06:53:14 +0000 (06:53 +0000)] 
allow setting window font and bg/fg color before creation
wxMSW and wxOSX don't have a problem with it, so neither should wxGTK

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

11 years agosimplify code setting backing pixmap
Paul Cornett [Thu, 10 Jan 2013 06:28:18 +0000 (06:28 +0000)] 
simplify code setting backing pixmap

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

11 years agoAdd HTTP status code definitions to attempt to fix VC6 compilation following #73325.
Steve Lamerton [Wed, 9 Jan 2013 20:27:48 +0000 (20:27 +0000)] 
Add HTTP status code definitions to attempt to fix VC6 compilation following #73325.

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

11 years agodon't use deprecated wxMouseState functions
Paul Cornett [Wed, 9 Jan 2013 03:27:11 +0000 (03:27 +0000)] 
don't use deprecated wxMouseState functions

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

11 years agoDetect when the window is still captured when dragging was aborted for some reason
Julian Smart [Tue, 8 Jan 2013 10:25:01 +0000 (10:25 +0000)] 
Detect when the window is still captured when dragging was aborted for some reason

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

11 years agoFill in mouse button and key state when generating mouse event for auto scrolling
Julian Smart [Tue, 8 Jan 2013 10:20:55 +0000 (10:20 +0000)] 
Fill in mouse button and key state when generating mouse event for auto scrolling

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

11 years agodefine wxComboBox rtti stuff even when wxUSE_COMBOCTRL==0
Paul Cornett [Sat, 5 Jan 2013 05:08:43 +0000 (05:08 +0000)] 
define wxComboBox rtti stuff even when wxUSE_COMBOCTRL==0

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

11 years agoAttempt to fix MSVC6 compilation after the previous commit.
Vadim Zeitlin [Fri, 4 Jan 2013 22:14:47 +0000 (22:14 +0000)] 
Attempt to fix MSVC6 compilation after the previous commit.

Include <shlobj.h> before our wx/msw/missing.h, otherwise many things were
redefined.

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

11 years agoIncluding wx/msw/missing.h to define INVALID_FILE_ATTRIBUTES for MSVC6.
Vadim Zeitlin [Fri, 4 Jan 2013 20:13:03 +0000 (20:13 +0000)] 
Including wx/msw/missing.h to define INVALID_FILE_ATTRIBUTES for MSVC6.

This header is also needed in filename.cpp (see r73317 for a previous commit
fixing the same problem in filefn.cpp).

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

11 years agoRe-lay out the grid sample window after auto-sizing the grid.
Vadim Zeitlin [Thu, 3 Jan 2013 20:47:18 +0000 (20:47 +0000)] 
Re-lay out the grid sample window after auto-sizing the grid.

Changing the size of the grid without updating the sizer resulted in
overlapping windows and a mess on the display.

Closes #14948.

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

11 years agogtk_assert_dialog_set_message() was unintentionally excluded in r73163
Paul Cornett [Thu, 3 Jan 2013 16:43:40 +0000 (16:43 +0000)] 
gtk_assert_dialog_set_message() was unintentionally excluded in r73163

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

11 years agogtk_assert_dialog_set_message is only defined if wxUSE_STACKWALKER is set
Jouk Jansen [Thu, 3 Jan 2013 15:19:01 +0000 (15:19 +0000)] 
gtk_assert_dialog_set_message is only defined if wxUSE_STACKWALKER is set

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

11 years agouse gtk_file_chooser_set_show_hidden() now that GTK 2.6 is required
Paul Cornett [Thu, 3 Jan 2013 06:09:43 +0000 (06:09 +0000)] 
use gtk_file_chooser_set_show_hidden() now that GTK 2.6 is required

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

11 years agoremove ancient SetModal(), it was deprecated long ago and is not present in wxMSW...
Paul Cornett [Thu, 3 Jan 2013 05:09:20 +0000 (05:09 +0000)] 
remove ancient SetModal(), it was deprecated long ago and is not present in wxMSW or wxOSX

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

11 years agolook for backtrace() in -lexecinfo, fixes #14942
Paul Cornett [Wed, 2 Jan 2013 18:11:30 +0000 (18:11 +0000)] 
look for backtrace() in -lexecinfo, fixes #14942

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

11 years agoChinese translations update from William Jiang.
Vadim Zeitlin [Wed, 2 Jan 2013 16:41:41 +0000 (16:41 +0000)] 
Chinese translations update from William Jiang.

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

11 years agoSlight improvements to wxWebView::EnableContextMenu() documentation.
Vadim Zeitlin [Mon, 31 Dec 2012 13:40:17 +0000 (13:40 +0000)] 
Slight improvements to wxWebView::EnableContextMenu() documentation.

Explain that the menu is enabled by default so the main use of this method is
to disable it.

Also add "@since" tags for the new methods.

And mention this in the changelog.

See #14789.

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

11 years agoAdd context menu enabling and disabling to wxWebView, all backends supported.
Steve Lamerton [Mon, 31 Dec 2012 13:21:21 +0000 (13:21 +0000)] 
Add context menu enabling and disabling to wxWebView, all backends supported.

Closes #14789.

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

11 years agoAdd handling of http errors to wxWebViewIE. Tidy up existing large case statement.
Steve Lamerton [Sun, 30 Dec 2012 20:19:58 +0000 (20:19 +0000)] 
Add handling of http errors to wxWebViewIE. Tidy up existing large case statement.

Closes #14877.

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

11 years agoSlovenian translations update from Martin Srebotnjak.
Vadim Zeitlin [Sat, 29 Dec 2012 23:47:03 +0000 (23:47 +0000)] 
Slovenian translations update from Martin Srebotnjak.

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

11 years agoFix wxLocale::GetInfo() in C locale under Windows.
Vadim Zeitlin [Sat, 29 Dec 2012 21:53:13 +0000 (21:53 +0000)] 
Fix wxLocale::GetInfo() in C locale under Windows.

Don't use LOCALE_USER_DEFAULT when the locale hadn't been changed because the
user default locale often (and maybe even always) is different from "C" locale
used by the CRT resulting in mismatch between the conventions used by
wxDateTime::Format(), which uses the CRT locale, and wxDateTime::Parse(),
which uses Windows format. Instead use the hard-coded values corresponding to
the "C" locale to ensure we use the same values as the CRT in this case.

This also reverts r73244 which was applies to make the unit tests pass before
this fix as it's not necessary any longer.

Closes #14918.

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

11 years agoEnsure that scrollbars are shown in scrolled popup in the popup sample.
Vadim Zeitlin [Sat, 29 Dec 2012 21:53:09 +0000 (21:53 +0000)] 
Ensure that scrollbars are shown in scrolled popup in the popup sample.

Don't call SetScrollbars(), this is overridden by sizer logic later. Instead,
add a sufficiently big window to the popup and make fix the size of the popup
itself to be smaller to ensure that the scrollbars do show.

Closes #14900.

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

11 years agoNo changes, just fix unused variable in wxUSE_STATBMP==0 build.
Vadim Zeitlin [Sat, 29 Dec 2012 21:53:05 +0000 (21:53 +0000)] 
No changes, just fix unused variable in wxUSE_STATBMP==0 build.

Move the condition used only for wxStaticBitmap positioning inside "#if
wxUSE_STATBMP" section.

Closes #14929.

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

11 years agoIncluding wx/msw/missing.h to define INVALID_FILE_ATTRIBUTES for MSVC6.
Vadim Zeitlin [Sat, 29 Dec 2012 21:53:03 +0000 (21:53 +0000)] 
Including wx/msw/missing.h to define INVALID_FILE_ATTRIBUTES for MSVC6.

This should fix the remaining problem in VC6 build.

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

11 years agoNo changes, just remove unneeded variable initialization.
Vadim Zeitlin [Sat, 29 Dec 2012 20:15:50 +0000 (20:15 +0000)] 
No changes, just remove unneeded variable initialization.

Don't initialize htmlWindowBorder in wxHtmlHelpWindow::Create() just to
overwrite it with another value on the next line.

Closes #14933.

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

11 years agoSpelling fixes in comments in wxOSX.
Vadim Zeitlin [Sat, 29 Dec 2012 20:15:44 +0000 (20:15 +0000)] 
Spelling fixes in comments in wxOSX.

No real changes.

Closes #14932.

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

11 years agoreference count the GtkMenuItem in wxMenuItem as well
Paul Cornett [Sat, 29 Dec 2012 07:07:29 +0000 (07:07 +0000)] 
reference count the GtkMenuItem in wxMenuItem as well

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

11 years agomake GTKNeedsParent() private
Paul Cornett [Sat, 29 Dec 2012 06:29:52 +0000 (06:29 +0000)] 
make GTKNeedsParent() private

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

11 years agom_menubar does not need to be public for hildon, it's the same as m_widget in that...
Paul Cornett [Sat, 29 Dec 2012 06:21:01 +0000 (06:21 +0000)] 
m_menubar does not need to be public for hildon, it's the same as m_widget in that case

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

11 years agoFix missing or broken interface items for Phoenix
Robin Dunn [Sat, 29 Dec 2012 02:32:16 +0000 (02:32 +0000)] 
Fix missing or broken interface items for Phoenix

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

11 years agouse wxDEPRECATED_CONSTRUCTOR() instead of inline
Paul Cornett [Fri, 28 Dec 2012 18:38:55 +0000 (18:38 +0000)] 
use wxDEPRECATED_CONSTRUCTOR() instead of inline

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

11 years agoremove unused variable assignment, closes #14928
Paul Cornett [Fri, 28 Dec 2012 17:04:01 +0000 (17:04 +0000)] 
remove unused variable assignment, closes #14928

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

11 years agoUse gtk_menu_item_remove_submenu() with GTK2
Paul Cornett [Fri, 28 Dec 2012 16:56:01 +0000 (16:56 +0000)] 
Use gtk_menu_item_remove_submenu() with GTK2
because gtk_menu_item_set_submenu() with NULL menu argument does not work
before GTK 2.12 and there is no need to avoid calling it on later GTK2 versions

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

11 years agoSuppress warning about _set_se_translator() for VC++ 10 and 11 too.
Vadim Zeitlin [Fri, 28 Dec 2012 16:03:24 +0000 (16:03 +0000)] 
Suppress warning about _set_se_translator() for VC++ 10 and 11 too.

Previously we disabled this warning for VC versions up to 9 but the warning
still seems to be as harmless as before for the newer versions too.

Closes #13607.

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

11 years agoDon't assume that wxTE_RICH(2) implies wxTE_MULTILINE for wxTextCtrl in wxOSX.
Vadim Zeitlin [Fri, 28 Dec 2012 16:03:20 +0000 (16:03 +0000)] 
Don't assume that wxTE_RICH(2) implies wxTE_MULTILINE for wxTextCtrl in wxOSX.

Under MSW single line text controls can still use these styles, so don't
assume that the control should be made multi-line just because one of them is
specified.

This fixes the appearance of the in-place text control in wxGridCellTextEditor
which is created with wxTE_RICH2 style to work around some wxMSW problem.

Closes #11681.

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

11 years agoProcess HDN_TRACK in wxMSW wxHeaderCtrl just in case.
Vadim Zeitlin [Fri, 28 Dec 2012 16:03:16 +0000 (16:03 +0000)] 
Process HDN_TRACK in wxMSW wxHeaderCtrl just in case.

This message is not supposed to be sent but apparently some buggy comctl32.dll
versions do send it instead of HDN_ITEMCHANGING, so handle it too.

Closes #13506.

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

11 years agoDon't call wxTextMeasure::BeginMeasuring() when using non-native wxDC.
Vadim Zeitlin [Fri, 28 Dec 2012 16:03:12 +0000 (16:03 +0000)] 
Don't call wxTextMeasure::BeginMeasuring() when using non-native wxDC.

This is useless as we don't use wxTextMeasure in this case but just forward to
the wxDC itself, and also results in an assert in wxMSW wxTextMeasure
implementation.

Closes #14916.

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

11 years agoParse files from include/wx/*.h when making wxMSW tags.
Vadim Zeitlin [Fri, 28 Dec 2012 16:03:09 +0000 (16:03 +0000)] 
Parse files from include/wx/*.h when making wxMSW tags.

Fix missing wxTextMeasure &c in wxMSW tags.

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

11 years agoAllow building wxGTK under Windows with MSVC.
Vadim Zeitlin [Fri, 28 Dec 2012 16:03:03 +0000 (16:03 +0000)] 
Allow building wxGTK under Windows with MSVC.

Replace a few more __WXMSW__ tests with __WINDOWS__ ones and modify bakefiles
to allow specifying the toolkit to be built in wxMSW makefiles.

Closes #13902.

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