wxWidgets.git
11 years agoDisable wxWebView::Find and associated functions under MinGW and VC6 to fix compilation
Steve Lamerton [Thu, 6 Sep 2012 08:39:12 +0000 (08:39 +0000)] 
Disable wxWebView::Find and associated functions under MinGW and VC6 to fix compilation

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

11 years agoFix wxVLogStatus definition.
Vadim Zeitlin [Sat, 1 Sep 2012 22:38:40 +0000 (22:38 +0000)] 
Fix wxVLogStatus definition.

This macro can be used with 2 arguments (format and argptr) or 3 (the frame
pointer as an additional first argument), so don't define it as taking 2
arguments but as a macro without arguments, as we already do for
wxVLogSysErrorfor the same reasons.

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

11 years agoFix example of using GetUnicodeKey() in the documentation.
Vadim Zeitlin [Fri, 31 Aug 2012 12:31:44 +0000 (12:31 +0000)] 
Fix example of using GetUnicodeKey() in the documentation.

A Unicode key is not always printable, it can be a control character as well.

Closes #14622.

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

11 years agoFix compilation after r72375 - LC_CTYPE requires locale.h.
Václav Slavík [Fri, 31 Aug 2012 10:45:45 +0000 (10:45 +0000)] 
Fix compilation after r72375 - LC_CTYPE requires locale.h.

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

11 years agoCorrect wxAuiManager library in documentation.
Vadim Zeitlin [Thu, 30 Aug 2012 20:26:09 +0000 (20:26 +0000)] 
Correct wxAuiManager library in documentation.

It's wxAUI, not wxBase.

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

11 years agoFix opening URLs in new window with recent Firefox under Windows.
Vadim Zeitlin [Thu, 30 Aug 2012 20:25:46 +0000 (20:25 +0000)] 
Fix opening URLs in new window with recent Firefox under Windows.

Don't fail if we can't replace "-1" in the WWW_OpenURL topic value stored in
the registry with "0", it can be already "0" for the recent Firefox versions.

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

11 years agoExplicitly reject the use of wxTE_PASSWORD in generic wxSpinCtrl.
Vadim Zeitlin [Thu, 30 Aug 2012 20:25:24 +0000 (20:25 +0000)] 
Explicitly reject the use of wxTE_PASSWORD in generic wxSpinCtrl.

wxTE_PASSWORD has the same value as wxALIGN_CENTRE_VERTICAL which could be
implicitly specified as part of wxALIGN_CENTRE, but should never be used with
wxSpinCtrl, so explicitly filter it out when creating the associated
wxTextCtrl.

Closes #14452.

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

11 years agoGenerate wxEVT_COMMAND_TEXT_ENTER events for generic wxSpinCtrl.
Vadim Zeitlin [Thu, 30 Aug 2012 20:25:01 +0000 (20:25 +0000)] 
Generate wxEVT_COMMAND_TEXT_ENTER events for generic wxSpinCtrl.

Pass wxTE_PROCESS_ENTER to wxSpinCtrlTextGeneric if it's specified for
wxSpinCtrl itself and also forward wxEVT_COMMAND_TEXT_ENTER events from it to
wxSpinCtrl itself.

This fixes lack of these events for wxSpinCtrlDouble under MSW and also lack
of them for any kind of wxSpinCtrl in the ports using generic version (notably
wxOSX).

Closes #14604.

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

11 years agoAdd wxSpinCtrl::SetBase() to allow entering hexadecimal numbers.
Vadim Zeitlin [Thu, 30 Aug 2012 20:24:38 +0000 (20:24 +0000)] 
Add wxSpinCtrl::SetBase() to allow entering hexadecimal numbers.

Add a generic SetBase() API even though right now only bases 10 and 16 are
supported as we might support other ones (e.g. 8?) in the future. Implement it
for MSW, GTK and generic versions.

Add controls allowing to test this feature to the widgets sample.

Add "base" property support to the XRC handler for wxSpinCtrl, document it and
test it in the xrc sample.

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

11 years agoRemove wxOSX implementation of wxSpinCtrl and use the generic one.
Vadim Zeitlin [Thu, 30 Aug 2012 20:24:12 +0000 (20:24 +0000)] 
Remove wxOSX implementation of wxSpinCtrl and use the generic one.

wxOSX doesn't provide a native spinner+text control so it used a generic
implementation of wxSpinCtrl but a different one to the version found in
src/generic/spinctlg.cpp.

Just use the real generic version instead, it doesn't make sense to have two
different versions of the same generic control.

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

11 years agoRefactor text to/from double conversion in wxSpinCtrlGenericBase.
Vadim Zeitlin [Thu, 30 Aug 2012 20:23:49 +0000 (20:23 +0000)] 
Refactor text to/from double conversion in wxSpinCtrlGenericBase.

The code always used ToDouble() and Format("%g") which was a bit strange for
integer-valued wxSpinCtrl. Move the conversions to their own virtual functions
for clarity, perhaps correctness and, especially, flexibility as they will be
overridden in wxSpinCtrl soon.

Also move wxSpinCtrlGenericBase::m_format to wxSpinCtrlDouble as the base
class really doesn't need it at all.

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

11 years agoRemove wxRTTI macros from wxSpinCtrlGTKBase.
Vadim Zeitlin [Thu, 30 Aug 2012 20:23:26 +0000 (20:23 +0000)] 
Remove wxRTTI macros from wxSpinCtrlGTKBase.

This is not a public class and it doesn't need to be appear in wxRTTI.

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

11 years agoFix position carried in wxSpin{Button,Ctrl} events for 32 bit values in wxMSW.
Vadim Zeitlin [Thu, 30 Aug 2012 20:23:03 +0000 (20:23 +0000)] 
Fix position carried in wxSpin{Button,Ctrl} events for 32 bit values in wxMSW.

Don't use WM_VSCROLL message parameter as the position because it's a 16 bit
value and is not enough for the spin controls using 32 bit range. Just use the
current value available from the control itself instead.

This fixes assert failures in the spin page of the widgets sample when
changing the value of a control when it is > SHRT_MAX.

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

11 years agoUse wxSOCKET_WAITALL in wxHTTP to ensure that all data is sent.
Vadim Zeitlin [Thu, 30 Aug 2012 20:22:40 +0000 (20:22 +0000)] 
Use wxSOCKET_WAITALL in wxHTTP to ensure that all data is sent.

POST-ing sufficiently big amounts of data in wxHTTP didn't work because it
couldn't be sent all at once to the server. Use wxSOCKET_WAITALL to ensure
that we do send all of the data.

Closes #14598.

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

11 years agoFix bugs in parsing wxLongLong values starting with zeroes.
Vadim Zeitlin [Thu, 30 Aug 2012 20:22:17 +0000 (20:22 +0000)] 
Fix bugs in parsing wxLongLong values starting with zeroes.

wxCRT_StrtoullBase(), used by wxString::To[U]LongLong(), didn't handle leading
zeroes nor leading 0x correctly: it never auto-detected base 8; didn't ignore
the leading 0 even if base 8 was specified explicitly; didn't recognize "0X"
prefix at all (only "0x").

Fix all these bugs and add test cases for parsing numbers in other bases to
the unit tests.

Closes #14596.

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

11 years agoAdded wxSimplebook class: a wxBookCtrl without controller.
Vadim Zeitlin [Thu, 30 Aug 2012 20:21:54 +0000 (20:21 +0000)] 
Added wxSimplebook class: a wxBookCtrl without controller.

This new control allows the program to show one of the several pages without
allowing the user to change them (or even see that there are several of them)
himself.

This class is fully inline, so it doesn't add anything to the library and
hence doesn't need neither wxUSE_SIMPLEBOOK nor the corresponding configure
option.

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

11 years agoVirtualize showing/hiding the pages in wxBookCtrlBase.
Vadim Zeitlin [Thu, 30 Aug 2012 20:21:29 +0000 (20:21 +0000)] 
Virtualize showing/hiding the pages in wxBookCtrlBase.

No real changes, just make it possible to change how the pages are hidden and
shown in the derived classes. This is not used by any of them yet, but will be
used by wxSimplebook soon.

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

11 years agoRemove unnecessary TranslateBookFlag() from the notebook sample.
Vadim Zeitlin [Thu, 30 Aug 2012 20:21:06 +0000 (20:21 +0000)] 
Remove unnecessary TranslateBookFlag() from the notebook sample.

It probably was needed before, when the flags had different values for
different controls, but is simply unused now.

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

11 years agoDocument that menu item bitmaps must be set before appending them.
Vadim Zeitlin [Thu, 30 Aug 2012 20:20:44 +0000 (20:20 +0000)] 
Document that menu item bitmaps must be set before appending them.

At least in MSW we need to know in advance whether we're going to use normal
items or owner-drawn ones currently.

Closes #3641.

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

11 years agoDon't lay out the window being destroyed unnecessarily.
Vadim Zeitlin [Thu, 30 Aug 2012 20:20:20 +0000 (20:20 +0000)] 
Don't lay out the window being destroyed unnecessarily.

This is just a small optimization: it's useless to waste time on redoing the
layout of a window that is going to be destroyed soon anyhow.

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

11 years agoUse wmain() if supported by the compiler/CRT instead of main().
Vadim Zeitlin [Thu, 30 Aug 2012 20:19:57 +0000 (20:19 +0000)] 
Use wmain() if supported by the compiler/CRT instead of main().

This avoids a needless conversion from (originally Unicode) command line to
ANSI by the CRT and conversion back by wxWidgets and, especially, ensures that
there is no data loss if the Unicode command line arguments can't be converted
into the current charset.

See #14580.

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

11 years agoDutch translations update from Thomas De Rocker.
Vadim Zeitlin [Thu, 30 Aug 2012 10:18:35 +0000 (10:18 +0000)] 
Dutch translations update from Thomas De Rocker.

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

11 years agoInclude gettext MO files in distribution archives.
Václav Slavík [Thu, 30 Aug 2012 09:59:14 +0000 (09:59 +0000)] 
Include gettext MO files in distribution archives.

It's the usual thing to do. Ideally, we'd also compile them as part of
build process, at least on Unix, but this is better than nothing.

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

11 years agoavoid duplication in native dialog
Stefan Csomor [Wed, 29 Aug 2012 12:17:31 +0000 (12:17 +0000)] 
avoid duplication in native dialog

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

11 years agouse global NSLayoutManager
Stefan Csomor [Wed, 29 Aug 2012 12:16:36 +0000 (12:16 +0000)] 
use global NSLayoutManager

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

11 years agoadd global NSLayoutManager instance
Stefan Csomor [Wed, 29 Aug 2012 12:15:50 +0000 (12:15 +0000)] 
add global NSLayoutManager instance

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

11 years agofixes #13557
Stefan Csomor [Wed, 29 Aug 2012 12:01:19 +0000 (12:01 +0000)] 
fixes #13557

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

11 years agotemporary workaround
Stefan Csomor [Wed, 29 Aug 2012 11:20:23 +0000 (11:20 +0000)] 
temporary workaround

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

11 years agopropagating font to the individual columns, changing row heights according to font...
Stefan Csomor [Wed, 29 Aug 2012 09:00:51 +0000 (09:00 +0000)] 
propagating font to the individual columns, changing row heights according to font size, fixes #14578

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

11 years agoremove duplicate code
Stefan Csomor [Wed, 29 Aug 2012 07:11:20 +0000 (07:11 +0000)] 
remove duplicate code

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

11 years agofixing usage of load states, set controller visible correctly
Stefan Csomor [Tue, 28 Aug 2012 19:00:23 +0000 (19:00 +0000)] 
fixing usage of load states, set controller visible correctly

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

11 years agoAdd support for searching and highlighting a wxWebView.
Steve Lamerton [Tue, 28 Aug 2012 17:13:13 +0000 (17:13 +0000)] 
Add support for searching and highlighting a wxWebView.

Currently supports WebView on GTK and IE. Closes #14045.

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

11 years agoUpdate of OpenVMS compile support
Jouk Jansen [Tue, 28 Aug 2012 06:27:50 +0000 (06:27 +0000)] 
Update of OpenVMS compile support

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

11 years agocompilation fix for case that wxHAS_RAW_BITMAP is NOT defined
Jouk Jansen [Tue, 28 Aug 2012 05:57:14 +0000 (05:57 +0000)] 
compilation fix for case that wxHAS_RAW_BITMAP is NOT defined

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

11 years agoRefreshed all source message catalogs.
Vadim Zeitlin [Mon, 27 Aug 2012 09:53:46 +0000 (09:53 +0000)] 
Refreshed all source message catalogs.

Ran "make allpo" to update the catalogs with the new strings.

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

11 years agoChinese translations update from Jiawei Huang.
Vadim Zeitlin [Mon, 27 Aug 2012 09:53:08 +0000 (09:53 +0000)] 
Chinese translations update from Jiawei Huang.

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

11 years agoreverting for the moment, original problem #12227, this leads eg in the mediaplayer...
Stefan Csomor [Mon, 27 Aug 2012 06:36:40 +0000 (06:36 +0000)] 
reverting for the moment, original problem #12227, this leads eg in the mediaplayer sample to a non-show of the noteobook page

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

11 years agoAvoid crashes when creating initially hidden MDI child under Unity.
Vadim Zeitlin [Sun, 26 Aug 2012 16:35:02 +0000 (16:35 +0000)] 
Avoid crashes when creating initially hidden MDI child under Unity.

Ignore "hide" signals for the menus without associated shown window. Ubuntu
Unity sends them and we crashed because of a recursive assert in the
corresponding signal handler before.

Now the code doesn't crash any more but the menus still don't behave correctly
when the last MDI child is destroyed.

Closes #13593.

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

11 years agoFixed typo in dialog project file
Julian Smart [Sat, 25 Aug 2012 18:04:11 +0000 (18:04 +0000)] 
Fixed typo in dialog project file

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

11 years agoFixed a problem with text effects flag always being set on dialog exit
Julian Smart [Sat, 25 Aug 2012 18:03:23 +0000 (18:03 +0000)] 
Fixed a problem with text effects flag always being set on dialog exit

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

11 years agoMake sure wchar_t CRT functions work on OS X.
Václav Slavík [Sat, 25 Aug 2012 11:14:44 +0000 (11:14 +0000)] 
Make sure wchar_t CRT functions work on OS X.

In OS X and iOS, wchar_t CRT functions convert to char* and fail under
some locales. The safest fix is to set LC_CTYPE to UTF-8 to ensure that
they can handle any input.

Note that this must be done for any app, Cocoa or console, whether or
not it uses wxLocale.

See http://stackoverflow.com/questions/11713745/why-does-the-printf-family-of-functions-care-about-locale

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

11 years agoTest if wxString::Format() works with non-ASCII format string.
Václav Slavík [Sat, 25 Aug 2012 11:14:17 +0000 (11:14 +0000)] 
Test if wxString::Format() works with non-ASCII format string.

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

11 years agosimpler implementation that also works over remote connections by Kevin O.
Stefan Csomor [Sat, 25 Aug 2012 09:38:12 +0000 (09:38 +0000)] 
simpler implementation that also works over remote connections by Kevin O.

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

11 years agoUkrainian translations update from Yuri Chornoivan.
Vadim Zeitlin [Fri, 24 Aug 2012 22:08:28 +0000 (22:08 +0000)] 
Ukrainian translations update from Yuri Chornoivan.

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

11 years agoNo changes, just a typo fix in wxRichTextCtrl UI code.
Vadim Zeitlin [Fri, 24 Aug 2012 22:08:05 +0000 (22:08 +0000)] 
No changes, just a typo fix in wxRichTextCtrl UI code.

s/minmum/minimum/g

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

11 years agoupdated setup.h for OpenVMS
Jouk Jansen [Thu, 23 Aug 2012 14:44:29 +0000 (14:44 +0000)] 
updated setup.h for OpenVMS

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

11 years agoupdated setup.h for OpenVMS
Jouk Jansen [Thu, 23 Aug 2012 13:43:18 +0000 (13:43 +0000)] 
updated setup.h for OpenVMS

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

11 years agoAdded Nepali translation.
Vadim Zeitlin [Wed, 22 Aug 2012 21:22:31 +0000 (21:22 +0000)] 
Added Nepali translation.

Thanks to Him Prasad Gautam and Mesar Hameed.

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

11 years agoFinnish translations update from Jani Kinnunen.
Vadim Zeitlin [Wed, 22 Aug 2012 21:22:04 +0000 (21:22 +0000)] 
Finnish translations update from Jani Kinnunen.

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

11 years agoLatvian translation improvements
Julian Smart [Fri, 17 Aug 2012 09:09:21 +0000 (09:09 +0000)] 
Latvian translation improvements

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

11 years agoCorrect a missing apostrophe in a doc string.
Robin Dunn [Thu, 16 Aug 2012 00:42:40 +0000 (00:42 +0000)] 
Correct a missing apostrophe in a doc string.

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

11 years agoUse the popup's background as a border on wxGTK too.
Robin Dunn [Thu, 16 Aug 2012 00:42:35 +0000 (00:42 +0000)] 
Use the popup's background as a border on wxGTK too.

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

11 years agoFix bug in ribbon bar label size calculation.
Vadim Zeitlin [Wed, 15 Aug 2012 23:34:40 +0000 (23:34 +0000)] 
Fix bug in ribbon bar label size calculation.

Due to an off by 1 error in wxString::Mid() call, the size computed was too
small and hence the label could have been not displayed at all.

Fix this and also replace Mid(0, n) with a more clear Left(n) call.

Closes #14566.

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

11 years agoAdd page highlighting to wxRibbonBar.
Vadim Zeitlin [Wed, 15 Aug 2012 23:34:36 +0000 (23:34 +0000)] 
Add page highlighting to wxRibbonBar.

Allow visually highlighting a page to make it more noticeable to the user.

Closes #14527.

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

11 years agoFix AUI appearance when a maximized pane becomes floating.
Vadim Zeitlin [Wed, 15 Aug 2012 23:34:31 +0000 (23:34 +0000)] 
Fix AUI appearance when a maximized pane becomes floating.

The other panes were not previously restored, resulting in bad appearance and
behaviour. Do restore them now before making the previous maximized pane
floating.

Closes #14460.

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

11 years agoRespect item max sizes in wxBoxSizer.
Vadim Zeitlin [Wed, 15 Aug 2012 23:34:27 +0000 (23:34 +0000)] 
Respect item max sizes in wxBoxSizer.

Don't give more space than the max size, if set, to wxBoxSizer elements.

Closes #11497.

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

11 years agoNo real changes, just add wxSizerItem::AddBorderToSize() helper.
Vadim Zeitlin [Wed, 15 Aug 2012 23:34:22 +0000 (23:34 +0000)] 
No real changes, just add wxSizerItem::AddBorderToSize() helper.

Factor out this function from GetMinSizeWithBorder() as it will be used for
max size too in a next commit.

See #11497.

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

11 years agoHonour window min and max sizes in wxWindow::GetBestSize().
Vadim Zeitlin [Wed, 15 Aug 2012 23:34:18 +0000 (23:34 +0000)] 
Honour window min and max sizes in wxWindow::GetBestSize().

The best size of the window should be at least as large as its min size and
less than its max size. This allows to override the windows own best size
determination with an explicit SetMinSize() or SetMaxSize() call.

See #11497.

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

11 years agoAdd wxSize::DecToIfSpecified() helper.
Vadim Zeitlin [Wed, 15 Aug 2012 23:34:15 +0000 (23:34 +0000)] 
Add wxSize::DecToIfSpecified() helper.

This is similar to DecTo() but can be used even if the wxSize argument has
some components set to -1.

Notice that we don't need IncToIfSpecified() because IncTo() already works
correctly anyhow in this case.

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

11 years agoDon't generate events from wxSpinCtrl::SetRange() in wxMSW.
Vadim Zeitlin [Wed, 15 Aug 2012 23:34:10 +0000 (23:34 +0000)] 
Don't generate events from wxSpinCtrl::SetRange() in wxMSW.

Other ports don't send wxEVT_COMMAND_SPINCTRL_UPDATED from SetRange() even if
the value changed because it was adjusted to fit into the new range and this
makes sense as this change is not due to a user action, so don't send this
event under wxMSW neither.

Also add a unit test checking for this behaviour.

Closes #14583.

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

11 years agoRestore the use of wxListCtrl in report view in wxListbook.
Vadim Zeitlin [Wed, 15 Aug 2012 11:34:46 +0000 (11:34 +0000)] 
Restore the use of wxListCtrl in report view in wxListbook.

This reverts r71965 for wxMSW as the list mode there doesn't work correctly if
there are sufficiently many items: the native control insists on laying them
out in multiple columns which is inappropriate for wxListbook, so use report
mode for horizontal wxListbooks. Do use the list mode in the vertical case as
we do want to have multiple columns -- and not rows -- then.

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

11 years agoFixes for forwarding events to parent in wxGenericListCtrl.
Vadim Zeitlin [Wed, 15 Aug 2012 11:34:43 +0000 (11:34 +0000)] 
Fixes for forwarding events to parent in wxGenericListCtrl.

Set the event object and the event ID correctly, i.e. to the values
corresponding to the main wxListCtrl itself, when forwarding mouse and
keyboard events from wxListMainWindow to wxListCtrl.

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

11 years agofix some compile warnings
Robin Dunn [Tue, 14 Aug 2012 07:13:39 +0000 (07:13 +0000)] 
fix some compile warnings

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

11 years agoUpdate the wxVersionInfo, and don't forget to initialize the new attributes of the...
Robin Dunn [Tue, 14 Aug 2012 05:55:23 +0000 (05:55 +0000)] 
Update the wxVersionInfo, and don't forget to initialize the new attributes of the event class.

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

11 years agoUpdate stc interface docs
Robin Dunn [Tue, 14 Aug 2012 05:55:15 +0000 (05:55 +0000)] 
Update stc interface docs

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

11 years agoUpdate new names to conform, add new event types and event attributes, etc.
Robin Dunn [Tue, 14 Aug 2012 05:55:08 +0000 (05:55 +0000)] 
Update new names to conform, add new event types and event attributes, etc.

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

11 years agoMinimal tweaks and additions to get wxSTC compiling successfully again, with Scintill...
Robin Dunn [Tue, 14 Aug 2012 05:14:46 +0000 (05:14 +0000)] 
Minimal tweaks and additions to get wxSTC compiling successfully again, with Scintilla 3.21

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

11 years agofix a couple typos
Robin Dunn [Tue, 14 Aug 2012 05:14:35 +0000 (05:14 +0000)] 
fix a couple typos

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

11 years agorebake make/project files for new scintilla
Robin Dunn [Tue, 14 Aug 2012 05:14:27 +0000 (05:14 +0000)] 
rebake make/project files for new scintilla

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

11 years agoInitial copy of Scintilla 3.21 code
Robin Dunn [Tue, 14 Aug 2012 05:14:09 +0000 (05:14 +0000)] 
Initial copy of Scintilla 3.21 code

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

11 years agoInterface fixes for Phoenix
Robin Dunn [Tue, 14 Aug 2012 05:11:59 +0000 (05:11 +0000)] 
Interface fixes for Phoenix

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

11 years agoforwarding style changes to documentViews, see #14578
Stefan Csomor [Sun, 12 Aug 2012 12:58:42 +0000 (12:58 +0000)] 
forwarding style changes to documentViews, see #14578

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

11 years agoFix typo in an example of Bind()-ing a function in the event overview.
Vadim Zeitlin [Sat, 11 Aug 2012 23:09:36 +0000 (23:09 +0000)] 
Fix typo in an example of Bind()-ing a function in the event overview.

Functors must be passed by const reference, not pointer.

Closes #14572.

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

11 years agoUpdate the icon of a parent item without children in wxDataViewCtrl.
Vadim Zeitlin [Sat, 11 Aug 2012 23:09:33 +0000 (23:09 +0000)] 
Update the icon of a parent item without children in wxDataViewCtrl.

Ensure that a parent item that doesn't have any children any more isn't left
with a "-" expander icon, it can't be collapsed any more but only expanded
again (possibly adding children under it dynamically). This results in better
behaviour in e.g. the last page of the dataview sample where the container
item remained with a "+" icon even after its both children were deleted.

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

11 years agoReally delete the item in wxDataViewTreeStore::DeleteItem().
Vadim Zeitlin [Sat, 11 Aug 2012 23:09:29 +0000 (23:09 +0000)] 
Really delete the item in wxDataViewTreeStore::DeleteItem().

For some incomprehensible reason only child branches were ever deleted from
the list of parents children in DeleteItem(), not simple tree items. This
meant that reexpanding a node after deleting all its children showed the
previously "deleted" children again.

Closes #14574.

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

11 years agoadding SetLabel -> SetTitle redirects, solves missing title updates using wxDocument...
Stefan Csomor [Sat, 11 Aug 2012 13:16:56 +0000 (13:16 +0000)] 
adding SetLabel -> SetTitle redirects, solves missing title updates using wxDocument/wxView

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

11 years agoRemove wxT from prototype
Robin Dunn [Fri, 10 Aug 2012 04:57:35 +0000 (04:57 +0000)] 
Remove wxT from prototype

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

11 years agoAllow --mac_universal_binary to use a "default" value.
Robin Dunn [Thu, 9 Aug 2012 16:54:24 +0000 (16:54 +0000)] 
Allow --mac_universal_binary to use a "default" value.

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

11 years agoAdd documentation for wxPrintAbortDialog since it is now documented as a return value...
Robin Dunn [Thu, 9 Aug 2012 16:47:48 +0000 (16:47 +0000)] 
Add documentation for wxPrintAbortDialog since it is now documented as a return value type.

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

11 years agoCompilation fix for r72307.
Václav Slavík [Thu, 9 Aug 2012 16:16:42 +0000 (16:16 +0000)] 
Compilation fix for r72307.

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

11 years agoShow progress of printing in wxMSW.
Václav Slavík [Thu, 9 Aug 2012 15:52:15 +0000 (15:52 +0000)] 
Show progress of printing in wxMSW.

Add the number of the page being printed as well as the total to the
wxMSW printing progress window. Improved the layout and fixed some i18n
issues in the process.

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

11 years agoFix crash when canceling printing in wxMSW.
Václav Slavík [Thu, 9 Aug 2012 15:52:11 +0000 (15:52 +0000)] 
Fix crash when canceling printing in wxMSW.

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

11 years agoReturn wxPrintAbortDialog from CreateAbortWindow().
Václav Slavík [Thu, 9 Aug 2012 15:52:08 +0000 (15:52 +0000)] 
Return wxPrintAbortDialog from CreateAbortWindow().

Instead of returning a generic wxWindow*, return the type actually used.
It was part of the public header already, but not used in any publicly
visible way.

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

11 years agoCreate wxPrintAbortDialog more sensibly.
Václav Slavík [Thu, 9 Aug 2012 15:52:04 +0000 (15:52 +0000)] 
Create wxPrintAbortDialog more sensibly.

Instead of having an empty constructor and filling the dialog with
controls from outside, do the work in the constructor.

This changes the meaning of ctor's 'title' argument, but this class'
terrible API made it unusable for direct use anyway, so it doesn't seem
to be harmful.

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

11 years agosilence GCC warning suggesting parentheses
Paul Cornett [Tue, 7 Aug 2012 16:43:56 +0000 (16:43 +0000)] 
silence GCC warning suggesting parentheses

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

11 years agoMake the modal print preview window behave like a modal dialog.
Václav Slavík [Tue, 7 Aug 2012 10:12:09 +0000 (10:12 +0000)] 
Make the modal print preview window behave like a modal dialog.

It's unexpected for a modal dialog window to show up in the taskbar as
app's another window. It also shouldn't be possible to minimize a modal
window, because it's very confusing when a window is unresponsive
without a clear reason, because the modal child is hidden in the
taskbar.

Set wxFRAME_NO_TASKBAR and remove wxMINIMIZE_BOX to fix this. Do it only
for wxPreviewFrame_AppModal.

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

11 years agoDon't crash in wxBitmap::AllocExclusive().
Václav Slavík [Mon, 6 Aug 2012 12:28:58 +0000 (12:28 +0000)] 
Don't crash in wxBitmap::AllocExclusive().

Just use the usual pattern, instead of abusing existing m_refData. In
addition to being cleaner and easier to follow, it also has the benefit
of not crashing when cloning ref data into an UnRef()ed bitmap from
AllocExclusive().

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

11 years agoA better fix for wxHash{Map,Set} with g++ 4.7.
Vadim Zeitlin [Mon, 6 Aug 2012 11:06:45 +0000 (11:06 +0000)] 
A better fix for wxHash{Map,Set} with g++ 4.7.

This reverts r70556, i.e. removes the scope operators added by it to all
WX_DECLARE_HASH_{MAP,SET} macros, and implements a workaround for the problem
due to the use of empty base class optimization in g++ 4.7 standard library
implementations inside the macros themselves by prepending the hasher and
comparator classes with explicit "struct".

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

11 years agoFix wxAutomationObject compilation in PCH-less build.
Vadim Zeitlin [Sun, 5 Aug 2012 22:44:31 +0000 (22:44 +0000)] 
Fix wxAutomationObject compilation in PCH-less build.

Don't use LCID in a public header, windows.h might not be included. Use WXLCID
stand-in instead.

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

11 years agoFix uniconizing hidden top level windows in wxMSW.
Vadim Zeitlin [Sun, 5 Aug 2012 22:44:26 +0000 (22:44 +0000)] 
Fix uniconizing hidden top level windows in wxMSW.

wxTLW wasn't properly restored if Iconize(false) was called while the window
was hidden.

Fix this by adding yet another special case to wxTopLevelWindowMSW::Show().
This makes it even less comprehensible than before but there doesn't seem to
be any obvious way to simplify this code without totally changing it.

Closes #14539.

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

11 years agoFix the checkbox cell size in generic wxDataViewToggleRenderer.
Vadim Zeitlin [Sun, 5 Aug 2012 22:44:21 +0000 (22:44 +0000)] 
Fix the checkbox cell size in generic wxDataViewToggleRenderer.

r62940 fixed an appearance problem with the checkboxes in wxDataViewCtrl but
introduced another one: as the checkbox was now always drawn in the entire
cell rectangle, the cell alignment was not taken into account any more.

Fix this by only increasing the checkbox rectangle up to the required minimal
size but not any more.

Closes #14504.

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

11 years agoAdd webview library in MSVC-specific setup.h.
Vadim Zeitlin [Sun, 5 Aug 2012 22:44:18 +0000 (22:44 +0000)] 
Add webview library in MSVC-specific setup.h.

wxNO_WEBVIEW_LIB was documented but not implemented: webview library was never
linked in implicitly at all. Fix this by adding the missing #pragma to
msvc/wx/setup.h.

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

11 years agoOptimization: skip 0-sized cells in wxGrid::CalcCellsExposed().
Vadim Zeitlin [Fri, 3 Aug 2012 15:36:25 +0000 (15:36 +0000)] 
Optimization: skip 0-sized cells in wxGrid::CalcCellsExposed().

There is no need to compute intersections with 0-sized cells, skip them to
speed up refresh of big grids.

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

11 years agoRemove unnecessary statement from the grid sample.
Vadim Zeitlin [Fri, 3 Aug 2012 15:36:21 +0000 (15:36 +0000)] 
Remove unnecessary statement from the grid sample.

No real changes.

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

11 years agoMake wxGraphicsContext::GetSize() const.
Vadim Zeitlin [Fri, 3 Aug 2012 13:05:11 +0000 (13:05 +0000)] 
Make wxGraphicsContext::GetSize() const.

Closes #14556.

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

11 years agoMake wxRect2D::Get{Position,Size}() const.
Vadim Zeitlin [Fri, 3 Aug 2012 12:50:03 +0000 (12:50 +0000)] 
Make wxRect2D::Get{Position,Size}() const.

Accessors should be const.

Closes #14555.

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

11 years agoRevert change that installs the wx/gtk/dc.h header file, since we no longer need...
Robin Dunn [Fri, 3 Aug 2012 03:57:06 +0000 (03:57 +0000)] 
Revert change that installs the wx/gtk/dc.h header file, since we no longer need wxDCImpl classes to be public.

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

11 years agoAdd the ability to trigger a print from JavaScript for the OSX backend of the wxWebVi...
Robin Dunn [Fri, 3 Aug 2012 03:56:59 +0000 (03:56 +0000)] 
Add the ability to trigger a print from JavaScript for the OSX backend of the wxWebView control.  Closes #14241

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

11 years agoAdd the ability to trigger a print from JavaScript for the old wxWebKitCtrl.
Robin Dunn [Fri, 3 Aug 2012 03:56:54 +0000 (03:56 +0000)] 
Add the ability to trigger a print from JavaScript for the old wxWebKitCtrl.

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

11 years agoEnable the wxMediaCtrl backend for wxOSX-cocoa in the build and fix some bugs that...
Robin Dunn [Thu, 2 Aug 2012 20:25:16 +0000 (20:25 +0000)] 
Enable the wxMediaCtrl backend for wxOSX-cocoa in the build and fix some bugs that were causing it to not send the EVT_MEDIA_LOADED events and to not have a valid best size set.  Closes #13065

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