]> git.saurik.com Git - wxWidgets.git/log
wxWidgets.git
14 years agoCorrect controller size determination in wxToolbook.
Vadim Zeitlin [Fri, 5 Mar 2010 23:55:04 +0000 (23:55 +0000)] 
Correct controller size determination in wxToolbook.

The old code used the current toolbar size instead of determining its best
size for some strange reason and this resulted in toolbar remaining of tiny (1
pixel) height at least under wxGTK.

Fix this by simply using the best size of the toolbar.

Closes #11606.

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

14 years agoUse wxWindow::ReleaseMouse() instead of MSW ::ReleaseCapture() function.
Vadim Zeitlin [Fri, 5 Mar 2010 23:55:00 +0000 (23:55 +0000)] 
Use wxWindow::ReleaseMouse() instead of MSW ::ReleaseCapture() function.

As we capture the mouse using wxWindow::CaptureMouse(), we must release it
with ReleaseMouse() and not just ReleaseCapture().

Closes #11791.

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

14 years agodefine TARGET_CPU (as a variable) also for formats using MSVS_PLATFORM; this allows...
Francesco Montorsi [Fri, 5 Mar 2010 20:51:42 +0000 (20:51 +0000)] 
define TARGET_CPU (as a variable) also for formats using MSVS_PLATFORM; this allows a simpler logic in the following tests (and in the user bakefiles)

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

14 years agoMoved property unattachment code from wxPropertyGridInterface::RemoveProperty() to...
Jaakko Salli [Thu, 4 Mar 2010 15:09:15 +0000 (15:09 +0000)] 
Moved property unattachment code from wxPropertyGridInterface::RemoveProperty() to wxPropertyGridPageState::DoDelete() - fixes deferred removal issue

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

14 years agono existing on iphone
Stefan Csomor [Thu, 4 Mar 2010 08:29:04 +0000 (08:29 +0000)] 
no existing on iphone

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

14 years agofixing leak, fixes #11781
Stefan Csomor [Wed, 3 Mar 2010 23:00:36 +0000 (23:00 +0000)] 
fixing leak, fixes #11781

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

14 years agofixing leak, fixes #11782
Stefan Csomor [Wed, 3 Mar 2010 21:52:46 +0000 (21:52 +0000)] 
fixing leak, fixes #11782

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

14 years agousing native fullscreen support and ShowEvent triggers
Stefan Csomor [Wed, 3 Mar 2010 16:53:34 +0000 (16:53 +0000)] 
using native fullscreen support and ShowEvent triggers

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

14 years agofixing warning
Stefan Csomor [Wed, 3 Mar 2010 16:51:15 +0000 (16:51 +0000)] 
fixing warning

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

14 years agomake sure ShowEvent doesn't get triggered to early during construction
Stefan Csomor [Wed, 3 Mar 2010 16:33:12 +0000 (16:33 +0000)] 
make sure ShowEvent doesn't get triggered to early during construction

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

14 years agoAllow using version-specific vc prefix in msvc/wx/setup.h.
Vadim Zeitlin [Wed, 3 Mar 2010 14:19:29 +0000 (14:19 +0000)] 
Allow using version-specific vc prefix in msvc/wx/setup.h.

We still use just "vc" by default for compatibility but allow the user to
predefine either wxMSVC_VERSION or wxMSVC_VERSION_AUTO to use the specified or
version-dependent prefix instead. This is very convenient when using multiple
MSVC versions.

See #11022.

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

14 years agoUse correct directory names in msvc/wx/setup.h for 64 bit builds.
Vadim Zeitlin [Wed, 3 Mar 2010 14:19:18 +0000 (14:19 +0000)] 
Use correct directory names in msvc/wx/setup.h for 64 bit builds.

Use _amd64 and _ia64 suffixes if _M_X64 or _M_IA64 is defined.

Closes #11022.

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

14 years agoAdded Arabic translation from Abdullah Abouzekry.
Vadim Zeitlin [Wed, 3 Mar 2010 14:19:13 +0000 (14:19 +0000)] 
Added Arabic translation from Abdullah Abouzekry.

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

14 years agoFix wxCommandProcessor compilation with wxUSE_ACCEL==0.
Vadim Zeitlin [Wed, 3 Mar 2010 14:19:05 +0000 (14:19 +0000)] 
Fix wxCommandProcessor compilation with wxUSE_ACCEL==0.

Leave the accelerator strings empty in this case.

Closes #11783.

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

14 years agoLayout the immediate parent of the info bar as described in the docs, not the top...
Robin Dunn [Wed, 3 Mar 2010 07:17:18 +0000 (07:17 +0000)] 
Layout the immediate parent of the info bar as described in the docs, not the top-level parent.

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

14 years agoDocument that images in buttons and menus might not be shown under GTK.
Vadim Zeitlin [Wed, 3 Mar 2010 01:08:19 +0000 (01:08 +0000)] 
Document that images in buttons and menus might not be shown under GTK.

Mention gtk-{button,menu}-images GTK+ settings.

See #11369.

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

14 years agoadd 64bit support to those formats which I could test and which support 64bit build...
Francesco Montorsi [Wed, 3 Mar 2010 00:35:44 +0000 (00:35 +0000)] 
add 64bit support to those formats which I could test and which support 64bit build modes (msvc, msvs2005prj and msvs2008prj) by adding a TARGET_CPU option similar to what wxWidgets bakefiles do (note the absence of the WX_ prefix since it does not make sense to have a wx-specific architecture); this additional feature allows correct inclusion of the vc_[amd64|ia64]_[lib|dll] path when building a wx-based project on Windows.

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

14 years ago(minor change) update list of supported Windows versions
Francesco Montorsi [Tue, 2 Mar 2010 23:21:54 +0000 (23:21 +0000)] 
(minor change) update list of supported Windows versions

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

14 years agoUse user locale with Latin-1 as fallback for command line arguments.
Vadim Zeitlin [Tue, 2 Mar 2010 20:46:18 +0000 (20:46 +0000)] 
Use user locale with Latin-1 as fallback for command line arguments.

Command line arguments can contain characters outside of 7 bit ASCII range.
Assume that they use the default user encoding but fall back to Latin-1 if
conversion failed.

Closes #11754.

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

14 years agoDon't use m_macToolbar in wxOSX wxToolBar if it is NULL.
Vadim Zeitlin [Tue, 2 Mar 2010 18:16:11 +0000 (18:16 +0000)] 
Don't use m_macToolbar in wxOSX wxToolBar if it is NULL.

This fixes a crash when a native toolbar is not used by wxToolBar as it
happens when it's used by wxToolbook for example.

Closes #11775.

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

14 years agoEnclose code using m_macToolbar in #if wxOSX_USE_NATIVE_TOOLBAR.
Vadim Zeitlin [Tue, 2 Mar 2010 18:16:02 +0000 (18:16 +0000)] 
Enclose code using m_macToolbar in #if wxOSX_USE_NATIVE_TOOLBAR.

Don't use m_macToolbar which is only used when the toolbar is a native one
when we don't really use the native toolbar.

This should fix compilation in case wxOSX_USE_NATIVE_TOOLBAR is 0.

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

14 years agoDocument GetBitmapMargins
Robin Dunn [Tue, 2 Mar 2010 00:23:31 +0000 (00:23 +0000)] 
Document GetBitmapMargins

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

14 years agoFix crash when accessing clipboard before entering the main loop.
Vadim Zeitlin [Mon, 1 Mar 2010 23:45:22 +0000 (23:45 +0000)] 
Fix crash when accessing clipboard before entering the main loop.

Check that we have an event loop running before yielding to it.

Notice that we really do need an event loop in wxClipboardSync as events must
be dispatched for the clipboard code to work so while not using the event loop
if it doesn't exist would have fixed a crash as well, it wouldn't allow to use
the clipboard in e.g. wxApp-derived class OnInit().

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

14 years agoInvalidate best size when the bitmap or bitmap position changes. Add GetBitmapMargins
Robin Dunn [Mon, 1 Mar 2010 23:20:35 +0000 (23:20 +0000)] 
Invalidate best size when the bitmap or bitmap position changes.  Add GetBitmapMargins

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

14 years agoUse the correct event class for the window modal notification
Robin Dunn [Mon, 1 Mar 2010 22:54:15 +0000 (22:54 +0000)] 
Use the correct event class for the window modal notification

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

14 years agoHave to implement wxPGProperty::DeleteChildren() differently so that it will work...
Jaakko Salli [Mon, 1 Mar 2010 15:30:03 +0000 (15:30 +0000)] 
Have to implement wxPGProperty::DeleteChildren() differently so that it will work with deferred property deletion

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

14 years agoHave to check for wxPG_SPLITTER_AUTO_CENTER style before setting propgrid column...
Jaakko Salli [Mon, 1 Mar 2010 15:26:07 +0000 (15:26 +0000)] 
Have to check for wxPG_SPLITTER_AUTO_CENTER style before setting propgrid column proportion in the sample

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

14 years agotranslate 0.5 offset into user space before applying translation, see #11769, see...
Stefan Csomor [Sun, 28 Feb 2010 17:29:47 +0000 (17:29 +0000)] 
translate 0.5 offset into user space before applying translation, see #11769, see #11771

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

14 years agomoving header for precomp builds
Stefan Csomor [Sun, 28 Feb 2010 17:27:49 +0000 (17:27 +0000)] 
moving header for precomp builds

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

14 years agoSimplify and correct bugs in wxMSW wxScrollBar message handling.
Vadim Zeitlin [Sun, 28 Feb 2010 11:30:55 +0000 (11:30 +0000)] 
Simplify and correct bugs in wxMSW wxScrollBar message handling.

For some reason we computed scroll increment from the native message and not
the new position directly which is actually simpler and probably would have
never resulted in a bug which exchanged the meanings of SB_TOP and SB_BOTTOM.

Get rid of nScrollInc and just update the position variable directly.

Closes #11741.

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

14 years agoNo real changes, just cleanup wxMSW wxScrollBar a little.
Vadim Zeitlin [Sun, 28 Feb 2010 11:30:51 +0000 (11:30 +0000)] 
No real changes, just cleanup wxMSW wxScrollBar a little.

Get rid of old, Win16-compatible, commented out code.

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

14 years agoMake it possible to use wxCharBuffer during program initialization.
Vadim Zeitlin [Sun, 28 Feb 2010 11:09:26 +0000 (11:09 +0000)] 
Make it possible to use wxCharBuffer during program initialization.

wxCharBuffer might be used during static initialization, even if only
implicitly. E.g. it is used by wxString::Format() which can be used to
initialize a global string. But it uses the global s_untypedNullData variable
might not be initialized yet resulting in mysterious failures.

Fix this in the usual way by wrapping access to the variable via a function.

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

14 years agoOnly add -woff 3970 to C[XX]FLAGS when using SGI mipsPro 7.4.4 or later.
Vadim Zeitlin [Sun, 28 Feb 2010 11:09:21 +0000 (11:09 +0000)] 
Only add -woff 3970 to C[XX]FLAGS when using SGI mipsPro 7.4.4 or later.

Previous mipsPro versions don't give this warning but do warn about "unknown
warning number 3970" if we use this -woff which is even more annoying than
original warning we tried to suppress.

This is a forward port of r45896 which somehow was only applied to 2.8 branch.

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

14 years agoCompilation fixes for wide char functions under IRIX with mipsPro.
Vadim Zeitlin [Sun, 28 Feb 2010 11:09:15 +0000 (11:09 +0000)] 
Compilation fixes for wide char functions under IRIX with mipsPro.

Use correct (XPG5, not XPG4) version of wcsftime().

Bring the wide char functions only declared in std namespace into global one
under IRIX.

Declare vswscanf() ourselves as we just don't seem to get its declaration from
C++ code (only from C99).

Add a cast to fix incorrect putws() signature.

All these fixes apply to IRIX 6.5.18 with mipsPro 7.4.2. It doesn't seem to
add configure checks for most of the above fixes as previous versions of both
the OS and the compiler should be completely extinct by now but we may need to
do it if anybody is still found to use them.

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

14 years agoFix for wxStringCheck compilation under IRIX using mipsPro.
Vadim Zeitlin [Sun, 28 Feb 2010 11:09:11 +0000 (11:09 +0000)] 
Fix for wxStringCheck compilation under IRIX using mipsPro.

IRIX mipsPro 7.4 refuses to instantiate a template with an inline function as
parameter. Work around this by using a function taking a function pointer
instead of using template wxStringCheck with inline wxIs{alpha,alnum,digit}.

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

14 years agoAlways declare wxCStrData::As[W]Char() as being inline.
Vadim Zeitlin [Sun, 28 Feb 2010 11:09:07 +0000 (11:09 +0000)] 
Always declare wxCStrData::As[W]Char() as being inline.

This fixes warnings with IRIX mipsPro and not only mingw32 and probably
doesn't do any harm with the other compilers.

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

14 years agoRearrange functions order so that they are effectively inlined.
Vadim Zeitlin [Sun, 28 Feb 2010 11:09:02 +0000 (11:09 +0000)] 
Rearrange functions order so that they are effectively inlined.

Define wxSizer::Insert(size_t, wxSizerItem *) before it is used so that it
could really be inlined.

This also fixes an IRIX mipsPro compiler warning.

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

14 years agoFix compilation with GTK+ 2.4.
Vadim Zeitlin [Sun, 28 Feb 2010 11:08:59 +0000 (11:08 +0000)] 
Fix compilation with GTK+ 2.4.

Support for ellipsization in GtkTreeView and gtk_window_set_focus_on_map() are
new in 2.6, don't use them with 2.4.

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

14 years agoSupport IRIX version of OpenGL multi sampling constants.
Vadim Zeitlin [Sun, 28 Feb 2010 11:08:54 +0000 (11:08 +0000)] 
Support IRIX version of OpenGL multi sampling constants.

Although OpenGL multi sampling extensions originated under IRIX, it doesn't
seem to use the standard names for the constants used and uses "SGI" suffix
for them instead of "ARB".

Add support for IRIX versions of GLX_SAMPLE_BUFFERS_ARB and GLX_SAMPLES_ARB
and also check if these constants are defined at all to avoid compilation
errors if they are not.

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

14 years agoFix the STC sources generation script to work with ancient Python.
Vadim Zeitlin [Sun, 28 Feb 2010 11:08:50 +0000 (11:08 +0000)] 
Fix the STC sources generation script to work with ancient Python.

Don't use True, set and join method of string objects which didn't exist in
prehistoric Python versions (such as 1.5 bundled with IRIX) as we can easily
work around their lack by using 1, list and string module join method instead.

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

14 years agoNo real changes, just remove an unused variable.
Vadim Zeitlin [Sun, 28 Feb 2010 11:08:46 +0000 (11:08 +0000)] 
No real changes, just remove an unused variable.

This fixes a warning from IRIX mipsPro compiler.

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

14 years agoRemove unused NO_SORT constant.
Vadim Zeitlin [Sun, 28 Feb 2010 11:08:42 +0000 (11:08 +0000)] 
Remove unused NO_SORT constant.

This fixrs an IRIX mipsPro compiler warning.

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

14 years agoInclude <locale.h> to get LC_XXX constants declaration.
Vadim Zeitlin [Sun, 28 Feb 2010 11:08:38 +0000 (11:08 +0000)] 
Include <locale.h> to get LC_XXX constants declaration.

This fixes a compilation error under IRIX when using mipsPro.

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

14 years agoRemove unnecessary comparison of unsigned variable with 0.
Vadim Zeitlin [Sun, 28 Feb 2010 11:08:34 +0000 (11:08 +0000)] 
Remove unnecessary comparison of unsigned variable with 0.

m_httpsize is of type size_t and so is always >= 0, no need to check for it.
And removing the check avoids a warning from at least IRIX mipsPro (and
probably others).

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

14 years agoRemove unused static constant.
Vadim Zeitlin [Sun, 28 Feb 2010 11:08:30 +0000 (11:08 +0000)] 
Remove unused static constant.

HOURS_PER_DAY was used only in the part of the code which was moved to
src/common/datetimefmt.cpp and some compilers (e.g. IRIX mipsPro) now warn
about an unused static constant in datetime.cpp, so just remove it from there.

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

14 years agoInclude the real iostream header and not just iosfwd from wx/stdstream.h.
Vadim Zeitlin [Sun, 28 Feb 2010 11:08:26 +0000 (11:08 +0000)] 
Include the real iostream header and not just iosfwd from wx/stdstream.h.

We need to include full [io]stream declaration and not just forward declare
them to be able to define classes deriving from them. Surprisingly, including
just <iosfwd> seems to work under most systems but it does not under IRIX.

So include the full <iostream> (or <iostream.h>) to be sure to get what we
need.

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

14 years agoSometimes change in varscrollable window's size can result in unused empty space...
Jaakko Salli [Sun, 28 Feb 2010 10:16:49 +0000 (10:16 +0000)] 
Sometimes change in varscrollable window's size can result in unused empty space after the last item. Fix it by decrementing first visible item position as long there is available space (fixes #11758).

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

14 years agoOverride CanFocus because the wxWindow level test will check if the NSTextView's...
Kevin Ollivier [Sat, 27 Feb 2010 02:51:45 +0000 (02:51 +0000)] 
Override CanFocus because the wxWindow level test will check if the NSTextView's parent scrollview can get keyboard focus, and will return no, meaning that wx won't set the focus to the text ctrl.

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

14 years agoMust clear property selection in wxPGProperty::SetChoices() or risk a crash
Jaakko Salli [Fri, 26 Feb 2010 15:45:30 +0000 (15:45 +0000)] 
Must clear property selection in wxPGProperty::SetChoices() or risk a crash

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

14 years agoFix assert when using year or decade view in Windows 7 calendar control.
Vadim Zeitlin [Fri, 26 Feb 2010 14:10:02 +0000 (14:10 +0000)] 
Fix assert when using year or decade view in Windows 7 calendar control.

Windows 7 native calendar control is capable of showing more than 3 months
simultaneously in its year or decade view which is shown when the user zooms
out of the month view by double clicking the control header. This resulted in
an assert failure in the code, update it to simply not do anything in this
view.

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

14 years agoFix assert on wxCalendarCtrl creation under Windows 7.
Vadim Zeitlin [Fri, 26 Feb 2010 14:09:58 +0000 (14:09 +0000)] 
Fix assert on wxCalendarCtrl creation under Windows 7.

Unlike previous versions of Windows, 7 includes the time component in the
return value of MonthCal_GetCurSel() and because of it the comparison with
m_date (which doesn't have any time part) fails.

Fix this by comparing just the date parts of the two wxDateTime objects.

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

14 years agoAdd pretty-printers for wxPoint, wxSize and wxRect.
Vadim Zeitlin [Fri, 26 Feb 2010 14:09:43 +0000 (14:09 +0000)] 
Add pretty-printers for wxPoint, wxSize and wxRect.

Also replace an if checking for the supported types with an array-based
approach to make it easier to add pretty printers for more types in the
future.

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

14 years agoAdded work around in wxPropertyGrid for a wxTextCtrl beep on enter press
Jaakko Salli [Thu, 25 Feb 2010 15:05:09 +0000 (15:05 +0000)] 
Added work around in wxPropertyGrid for a wxTextCtrl beep on enter press

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

14 years agoFixed property Hide command
Jaakko Salli [Thu, 25 Feb 2010 14:04:25 +0000 (14:04 +0000)] 
Fixed property Hide command

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

14 years agoInitialize wxhInstance in console MSW applications too.
Vadim Zeitlin [Thu, 25 Feb 2010 00:04:03 +0000 (00:04 +0000)] 
Initialize wxhInstance in console MSW applications too.

Console applications still may need to create windows and for this a valid
HINSTANCE is needed. So set it ourselves during wx initialization.

Closes #11727.

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

14 years agoUse wxGetInstance() instead of wxhInstance in wxMSW code.
Vadim Zeitlin [Thu, 25 Feb 2010 00:03:59 +0000 (00:03 +0000)] 
Use wxGetInstance() instead of wxhInstance in wxMSW code.

No real changes, just use an accessor function instead of directly accessing
the global variable.

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

14 years agoInclude wx/defs.h from all our public headers, including wx/imaglist.h.
Vadim Zeitlin [Thu, 25 Feb 2010 00:03:53 +0000 (00:03 +0000)] 
Include wx/defs.h from all our public headers, including wx/imaglist.h.

Without including wx/defs.h first, symbols such as __WXMSW__ are not defined
if this header is the first wxWidgets header to be included.

Closes #11718.

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

14 years agoFix harmless g++ 4.3 warning about suggested parentheses.
Vadim Zeitlin [Thu, 25 Feb 2010 00:03:48 +0000 (00:03 +0000)] 
Fix harmless g++ 4.3 warning about suggested parentheses.

Closes #11719.

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

14 years agoFix multiple bugs in non-ownerdrawn wxListBox after recent merge.
Vadim Zeitlin [Thu, 25 Feb 2010 00:03:44 +0000 (00:03 +0000)] 
Fix multiple bugs in non-ownerdrawn wxListBox after recent merge.

Changes done in ownerdraw-refactor branch have broken non-ownerdrawn list
boxes as the code was now using m_aItems array even for them but it's not used
in this case.

Also remove unnecessarily overridden Delete() method which didn't add anything
to the base class implementation but just deleted the same m_aItems pointer
twice.

Also use HasFlag(wxLB_OWNERDRAW) everywhere consistently instead of testing
for it manually.

Closes #11729.

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

14 years agoDocument the use of --disable-gui for building wxBase.
Vadim Zeitlin [Thu, 25 Feb 2010 00:03:39 +0000 (00:03 +0000)] 
Document the use of --disable-gui for building wxBase.

We don't have a special configure version for wxBase where GUI is off by
default and it doesn't seem to be worth the trouble to create one. Instead
just tell people to use --disable-gui themselves.

Closes #11733.

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

14 years agoAlways use UTF-8 for GTK+ strings.
Vadim Zeitlin [Thu, 25 Feb 2010 00:03:35 +0000 (00:03 +0000)] 
Always use UTF-8 for GTK+ strings.

Strings returned and accepted by GTK+ functions always use UTF-8 independently
of the current locale and of the file name encoding we use. So use UTF-8
instead of wxConvFileName everywhere where we deal with GTK+ directly.

Closes #11743.

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

14 years agoCompilation fixes in wxHTML for wxUSE_CONFIG==0.
Vadim Zeitlin [Thu, 25 Feb 2010 00:03:30 +0000 (00:03 +0000)] 
Compilation fixes in wxHTML for wxUSE_CONFIG==0.

Surround uses of wxConfig with #of wxUSE_CONFIG in wxHTML code.

Closes #11750.

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

14 years agoDocument more wxDC drawing functions overloads.
Vadim Zeitlin [Thu, 25 Feb 2010 00:03:22 +0000 (00:03 +0000)] 
Document more wxDC drawing functions overloads.

Document overloads taking wxPoint/wxSize/wxRect in addition to the versions
taking individual wxCoords.

Closes #11752.

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

14 years agoFixed typo in wxDataViewIconTextRenderer docs.
Bryan Petty [Wed, 24 Feb 2010 22:09:52 +0000 (22:09 +0000)] 
Fixed typo in wxDataViewIconTextRenderer docs.

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

14 years agoproper app shutdown support for iphone
Stefan Csomor [Tue, 23 Feb 2010 17:32:01 +0000 (17:32 +0000)] 
proper app shutdown support for iphone

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

14 years agoSet up default property grid unspecified value colour
Jaakko Salli [Tue, 23 Feb 2010 15:29:10 +0000 (15:29 +0000)] 
Set up default property grid unspecified value colour

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

14 years agoWhen drawing wxPropertyGrid check box editor, be consistent with the other editors...
Jaakko Salli [Tue, 23 Feb 2010 15:24:50 +0000 (15:24 +0000)] 
When drawing wxPropertyGrid check box editor, be consistent with the other editors and use dc.GetTextForeground() for obtaining check box colour

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

14 years agoRename property pending for deletion so it won't be in the way of the user code
Jaakko Salli [Mon, 22 Feb 2010 17:04:18 +0000 (17:04 +0000)] 
Rename property pending for deletion so it won't be in the way of the user code

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

14 years agoProperty removal and deletion done from wxPropertyGrid event handler is now postponed...
Jaakko Salli [Mon, 22 Feb 2010 16:44:56 +0000 (16:44 +0000)] 
Property removal and deletion done from wxPropertyGrid event handler is now postponed to idle event

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

14 years agoCocoa text fields and views have their own context menus, so we should use those...
Kevin Ollivier [Mon, 22 Feb 2010 01:56:42 +0000 (01:56 +0000)] 
Cocoa text fields and views have their own context menus, so we should use those instead.

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

14 years agoSince wxDialog::Show(false) only calls wxWindow::Show, we must explicitly hide the...
Kevin Ollivier [Fri, 19 Feb 2010 07:01:33 +0000 (07:01 +0000)] 
Since wxDialog::Show(false) only calls wxWindow::Show, we must explicitly hide the dialog ourselves.

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

14 years agoTypo fix.
Kevin Ollivier [Fri, 19 Feb 2010 07:00:49 +0000 (07:00 +0000)] 
Typo fix.

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

14 years agoDisable sending of events by OS X Combobox during programmatic changes.
Kevin Ollivier [Fri, 19 Feb 2010 03:00:07 +0000 (03:00 +0000)] 
Disable sending of events by OS X Combobox during programmatic changes.

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

14 years agoFixed auto-resizing behavior when double-clicking a splitter; Added wxPropertyGrid...
Jaakko Salli [Tue, 16 Feb 2010 16:24:30 +0000 (16:24 +0000)] 
Fixed auto-resizing behavior when double-clicking a splitter; Added wxPropertyGrid::ResetColumnSizes(); wxPropertyGrid::GetSplitterPosition() got splitterIndex argument

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

14 years agoAdded wxPropertyGridInterface::GetColumnProportion()
Jaakko Salli [Tue, 16 Feb 2010 15:38:12 +0000 (15:38 +0000)] 
Added wxPropertyGridInterface::GetColumnProportion()

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

14 years agoAdded missing words in event documentation
Jaakko Salli [Tue, 16 Feb 2010 14:15:59 +0000 (14:15 +0000)] 
Added missing words in event documentation

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

14 years agoDocument wxEVT_PG_CHANGED
Jaakko Salli [Tue, 16 Feb 2010 14:12:23 +0000 (14:12 +0000)] 
Document wxEVT_PG_CHANGED

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

14 years agoAdd user for buildbot notifications.
Michael Wetherell [Tue, 16 Feb 2010 09:44:08 +0000 (09:44 +0000)] 
Add user for buildbot notifications.

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

14 years agoApply new patch fixing problem of IsRunning always returning True. See #11699
Robin Dunn [Mon, 15 Feb 2010 17:34:21 +0000 (17:34 +0000)] 
Apply new patch fixing problem of IsRunning always returning True.  See #11699

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

14 years agoImplement case-insensitive find and read only support for Cocoa combobox.
Kevin Ollivier [Mon, 15 Feb 2010 04:23:49 +0000 (04:23 +0000)] 
Implement case-insensitive find and read only support for Cocoa combobox.

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

14 years agoFix wxHtmlWindow to correctly decide whether to show scrollbars.
Václav Slavík [Sun, 14 Feb 2010 15:27:42 +0000 (15:27 +0000)] 
Fix wxHtmlWindow to correctly decide whether to show scrollbars.

wxHtmlWindow::CreateLayout()'s algorithm was both naive (not properly
accounting for scrollbar visibility changes during layout) and broken
(incorrectly rounding when computing scroll steps and adding
GetCharHeight() value to the height in an attempt to mitigate the
harm).

This algorithm should properly for scrollbars in all situations.
Rounding is done in such way that the content is fully viewable, while
at the same time not showing scrollbars needlessly.

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

14 years agoAdded note about removed member function wxPropertyGrid::CanClose()
Jaakko Salli [Sun, 14 Feb 2010 14:37:56 +0000 (14:37 +0000)] 
Added note about removed member function wxPropertyGrid::CanClose()

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

14 years agoAdded wxPropertyGridInterface::SetColumnProportion(); wxPG_SPLITTER_AUTO_CENTER windo...
Jaakko Salli [Sun, 14 Feb 2010 14:09:06 +0000 (14:09 +0000)] 
Added wxPropertyGridInterface::SetColumnProportion(); wxPG_SPLITTER_AUTO_CENTER window style now supports column counts higher than two.

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

14 years agoBasic support for tooltips under OS X Cocoa.
Kevin Ollivier [Sat, 13 Feb 2010 06:30:06 +0000 (06:30 +0000)] 
Basic support for tooltips under OS X Cocoa.

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

14 years agoFix compilation of wx/scopeguard.h with g++ -fno-exceptions.
Vadim Zeitlin [Fri, 12 Feb 2010 22:47:25 +0000 (22:47 +0000)] 
Fix compilation of wx/scopeguard.h with g++ -fno-exceptions.

Don't use try/catch in public headers if exceptions support is disabled with a
compiler switch.

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

14 years agoRemove wxHAS_NAMESPACES and gcc 2.95 checks.
Vadim Zeitlin [Fri, 12 Feb 2010 22:47:21 +0000 (22:47 +0000)] 
Remove wxHAS_NAMESPACES and gcc 2.95 checks.

We use namespaces elsewhere without any checks now so it doesn't make sense to
keep checking for them here.

We also don't support g++ 2.95 since ages so no need to check for it neither.

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

14 years agoUkrainian translations update from Yuri Chornoivan.
Vadim Zeitlin [Fri, 12 Feb 2010 11:22:43 +0000 (11:22 +0000)] 
Ukrainian translations update from Yuri Chornoivan.

Also changed charset from KOI8-U to UTF-8for ease of maintenance.

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

14 years agoMake it possible to subclass wxMenuBar in XRC (patch #11679).
Václav Slavík [Thu, 11 Feb 2010 12:48:29 +0000 (12:48 +0000)] 
Make it possible to subclass wxMenuBar in XRC (patch #11679).

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

14 years agoFixed possible buffer overflow in wxXmlResource::GetXRCID() (patch #11715).
Václav Slavík [Thu, 11 Feb 2010 12:36:16 +0000 (12:36 +0000)] 
Fixed possible buffer overflow in wxXmlResource::GetXRCID() (patch #11715).

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

14 years agoRemoved most of the propgrid '#ifndef SWIG' pre-compiler conditions
Jaakko Salli [Wed, 10 Feb 2010 16:45:39 +0000 (16:45 +0000)] 
Removed most of the propgrid '#ifndef SWIG' pre-compiler conditions

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

14 years agoFixed wxGauge's best size to conform to Windows HIG.
Václav Slavík [Wed, 10 Feb 2010 13:31:58 +0000 (13:31 +0000)] 
Fixed wxGauge's best size to conform to Windows HIG.

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

14 years agoMove wxPosixPermissions definition from wx/file.h to wx/filefn.h.
Vadim Zeitlin [Wed, 10 Feb 2010 11:38:41 +0000 (11:38 +0000)] 
Move wxPosixPermissions definition from wx/file.h to wx/filefn.h.

This fixes compilation with wxUSE_FILE=0 as wxFileName::Mkdir() still uses
these constants but their definitions were not available in this case.

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

14 years agosupport fullscreen display (translucent status) in all 4 orientations
Stefan Csomor [Tue, 9 Feb 2010 09:35:22 +0000 (09:35 +0000)] 
support fullscreen display (translucent status) in all 4 orientations

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

14 years agoTest m_nowpeer pointer before using it.
Robin Dunn [Tue, 9 Feb 2010 01:34:11 +0000 (01:34 +0000)] 
Test m_nowpeer pointer before using it.

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

14 years agoSet Id and EventObject for wxSetCursorEvent
Robin Dunn [Tue, 9 Feb 2010 01:33:44 +0000 (01:33 +0000)] 
Set Id and EventObject for wxSetCursorEvent

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

14 years agoIgnore the time portion of the datetime object when setting the date.
Robin Dunn [Tue, 9 Feb 2010 01:32:21 +0000 (01:32 +0000)] 
Ignore the time portion of the datetime object when setting the date.

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

14 years agoRemove functions duplicated in dnd_osx.cpp.
Robin Dunn [Tue, 9 Feb 2010 01:24:22 +0000 (01:24 +0000)] 
Remove functions duplicated in dnd_osx.cpp.

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

14 years agoAllow more than one timer with the same ID. Closes #11699.
Robin Dunn [Mon, 8 Feb 2010 20:06:04 +0000 (20:06 +0000)] 
Allow more than one timer with the same ID.  Closes #11699.

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

14 years agoAdd support for showing "elevation" icon in wxMSW buttons.
Vadim Zeitlin [Mon, 8 Feb 2010 19:52:00 +0000 (19:52 +0000)] 
Add support for showing "elevation" icon in wxMSW buttons.

Add, document and test in the widgets sample wxButton::SetAuthNeeded().

Closes #11705.

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

14 years agoadding carbon event missing in 10.4 headers
Stefan Csomor [Mon, 8 Feb 2010 07:20:39 +0000 (07:20 +0000)] 
adding carbon event missing in 10.4 headers

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