Commit Graph

55330 Commits

Author SHA1 Message Date
Vadim Zeitlin
adb783cc0a Remove another unneeded TOOLKIT test from the bakefiles.
Don't check the toolkit unnecessarily, this doesn't really change anything
right now but will not break wxGTK build under MSW when support for it is
added.

Closes #14379.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:42:02 +00:00
Vadim Zeitlin
d44d80da5b Add wx/setup.h header for wxGTK build under MSW.
This is identical to wx/msw/setup0.h but will be used by wxGTK builds using
MSVC when this is supported.

Closes #14395.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:41:59 +00:00
Vadim Zeitlin
18717b27d6 Compilation fix in non-PCH build of wxMSW wxStaticBox.
Include wx/sizer.h now that we use sizers in static box DoGetBestSize().

Closes #14397.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:41:53 +00:00
Vadim Zeitlin
1c0a0736a3 Don't use generic wxListCtrl style for wxListMainWindow.
This resulted in double border around wxListCtrl contents in wxOSX and almost
certainly other ports except wxGTK for which we already had an explicit
preprocessor check in the generic list control code. Remove it and simply
don't use any wxListCtrl-specific styles, including borders, for its main
window as it doesn't make any sense.

Closes #3701.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:41:50 +00:00
Vadim Zeitlin
ac6d7c66e0 Make wxMSW tree item unlocking reentrant.
Handle creating nested TreeItemUnlocker objects correctly. This fixes the
problem when a wxTreeCtrl method unlocking some item is called with another
item is already unlocked, e.g. from a selection changed event handler.

Closes #14400.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 21:41:40 +00:00
Stefan Csomor
d52ded25c1 support for native tlw parents, see #14252
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 18:44:31 +00:00
Stefan Csomor
9651e41c1c using callback for menu enabling, allows to benefit from system menu disabling eg for modal dialogs, see #14177
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 00:23:22 +00:00
Stefan Csomor
2f9d199130 setting source as this, according to thread '[wx-dev] Bug in wxMenuBarBase::UpdateMenus'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-12 00:21:51 +00:00
Robin Dunn
1dcb50be4a Fix compilation error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-10 17:09:49 +00:00
Vadim Zeitlin
f421e3f119 Fix wxHTMLDataObject compilation and memory leaks.
Use wxString::FromUTF8() and utf8_str() instead of directly using wxConvUTF8
as this is simpler and also works correctly in non-Unicode build (and more
efficiently in UTF-8 build as no conversion is done there).

Do not allocate -- and leak -- buffer in wxHTMLDataObject::GetDataHere(),
we're supposed to be putting data into the caller-provided buffer instead of
using our own.

Closes #14391.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-10 11:57:20 +00:00
Robin Dunn
0681e07a14 Keep track of the area intended to be buffered, and use that in UnMask instead of defaulting to the buffer size. Only clip to the DC size if wxBUFFER_VIRTUAL_AREA is not set. This fixes the issue where buffering the full virtual area in a wxScrolledWindow would only draw an area the physical size of the window. Fixes #11612.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 19:26:19 +00:00
Robin Dunn
dab0a95bab Add doc for SendAutoScrollEvents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 19:26:12 +00:00
Vadim Zeitlin
fd20ceff24 Fix wxWindow::IsDescendant() to work with argument equal to this window.
Passing the window itself as IsDescendant() argument for a top level window
resulted in a NULL pointer dereference. Fix this and also simplify the
function code by not using the parent window before checking it's !NULL.

Closes #14387.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 18:44:18 +00:00
Vadim Zeitlin
9bd5c5fcda Use wxString::Clone() instead of c_str() in wxThreadEvent copy ctor.
Creating a new wxString from c_str() of the old one resulted in dropping all
string data after the first embedded NUL. Fix this by using Clone() method
that exists specifically for this purpose. It also makes the code more clear.

Closes #14380.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 18:44:14 +00:00
Vadim Zeitlin
5c3f21c6a3 Use PLATFORM checks in bakefiles instead of TOOLKIT checks.
No real changes as the output is currently the same for all supported
PLATFORM/TOOLKIT combinations anyhow but prefer checking for PLATFORM to
prepare for the support of GTK toolkit under MSW platform.

Closes #14379.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 18:44:10 +00:00
Robin Dunn
cf737db657 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-08 05:11:21 +00:00
Paul Cornett
d5027818a4 fix warnings about conversion to bool, closes #14381
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 05:18:30 +00:00
Paul Cornett
ecdfd09516 fix warnings about unreachable return statements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 05:13:19 +00:00
Robin Dunn
e1b8b76fcf Add export macro for wxTreeListEvent so the non-inline class info and things can be found where they're exepcted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 04:43:15 +00:00
Robin Dunn
4af280d8ca Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 04:43:09 +00:00
Robin Dunn
9c58d1d310 Add missing wxRichToolTip::SetTitleFont implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 04:43:02 +00:00
Robin Dunn
08f639f16e Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-07 04:42:57 +00:00
Václav Slavík
432d207e1c wxHtmlHelpWindow: Fix contents panel syncing with view.
Simply opened page notification code. Fix it to really highlight the
page currently visible, instead of the previous one.

Fixes #14320.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-06 17:18:15 +00:00
Robin Dunn
7af4648f66 add missing public keyword for base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-06 02:06:24 +00:00
Robin Dunn
d18eb918f4 If there is a sizer then use it's calculated minimum in wxStaticBox::DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 21:26:53 +00:00
Robin Dunn
5eeccdd52c Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 21:26:48 +00:00
Robin Dunn
f15e648744 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 21:26:42 +00:00
Paul Cornett
12a5cf1324 Workaround for Ubuntu 12.04 run time warning
"LIBDBUSMENU-GLIB-WARNING **: Trying to remove a child that doesn't believe we're it's parent."
Avoid calling gtk_widget_destroy() on a wxMenuBar attached to a frame
Fixes #14292


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 16:49:28 +00:00
Vadim Zeitlin
c7001dcd53 Don't give incorrect example in wxTextEntry::GetInsertionPoint() docs.
Using the text control position as index in GetValue() is wrong in general,
show the correct way of doing this.

Closes #14372.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 12:21:29 +00:00
Vadim Zeitlin
a15f0e42bc Fix ribbon sample compilation after r71642.
Add a missing header with declaration of wxMessageBox() for PCH-less
compilation.

Closes #14376.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-05 12:12:43 +00:00
Paul Cornett
401c8bc231 Fix layout of wxStaticText, and possibly other controls.
GtkLabel perversely does not use its actual size to do layout, but will use its
size request. So restore calling gtk_widget_set_size_request() for all widgets,
which was removed in r71465. See #14374


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-04 17:36:51 +00:00
Julian Smart
340ef5c5ab Corrected collection of common attributes, for clashing font size units.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-04 09:13:13 +00:00
Vadim Zeitlin
0a7ee6e0f4 Implement support for wxRIBBON_PANEL_EXT_BUTTON wxRibbonPanel style.
Show the "extension button" in the ribbon panel if this style is specified.

Also generate a specific event if this button is clicked.

Closes #14283.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 19:17:09 +00:00
Vadim Zeitlin
07c7226468 Add wxRibbonControl::GetAncestorRibbonBar() helper.
New method allowing to find the ribbon bar containing the given window.

See #14283.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 19:17:03 +00:00
Vadim Zeitlin
017dc06b50 Use wxString::t_str() in calls to Windows API functions in wxMSW.
Use t_str() instead of wx_str() to make the code work correctly in UTF-8 build
in which wx_str() returns a pointer to UTF-8 buffer while we need a wchar_t
pointer for Windows.

Closes #14371.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 19:16:59 +00:00
Steve Lamerton
f40f8e1722 Use wxCOMPtr throughout wxWebViewIE to simplify the code and reduce the chance of memory leaks. Also mark PPV_ARGS_CHECK as inline so it can be used from multiple libraries.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 17:41:32 +00:00
Vadim Zeitlin
41087dc90a Add support for MSVC 11 (a.k.a. MSVS 2012) to MSVC-specific setup.h.
Use vc110 prefix for VC11.

Closes #14366.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 22:34:21 +00:00
Vadim Zeitlin
0c9dd3b69b Clear old selection when wxListBox becomes empty.
When UpdateOldSelections() is called from wxListBox::DoClear(), it must clear
the old selections array even for single selection list boxes, but it didn't
do this under non-MSW platforms.

Specifically check for the case of an empty listbox now and just forget the
old selections then. This fixes the problem of keeping stale old selections
and is also more efficient as we avoid the unnecessary GetSelections() call.

Really closes #14359.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 22:34:17 +00:00
Vadim Zeitlin
125afca0c0 Add wxMSW_CONV_LPCTSTR() and related macros and use them in wxBase.
Add macros hiding the ugly casts needed to pass wxStrings to Windows API
functions and use them in a couple of places in wxBase to simplify the code.

Closes #14338.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 22:34:13 +00:00
Vadim Zeitlin
784130d290 Disable wxUIActionSimulator wxGrid tests using mouse under wxGTK.
Something is seriously wrong with simulated mouse events and wxGrid under
wxGTK, they seem to simply disappear sometimes. This results in unit tests
suite failure, so disable these tests for the next release as I just don't
understand how to fix them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 16:21:08 +00:00
Vadim Zeitlin
f1287154cd Add IsAutomaticTest() function to the unit tests.
This allows to easily test if we're running on a buildbot slave and disable
some difficult to debug test failures there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 16:21:06 +00:00
Vadim Zeitlin
e84d989930 Use printf() instead of wxPrintf() in cppunit details listener.
Wide char output from wxPrintf() didn't appear at all under Linux because
stdout was switched into narrow stream mode by GNU libc due to initial use of
cout in the test.

Use printf() instead of wxPrintf() as we are only printing ASCII strings
anyhow. Of course, this is not a real fix but at least we can see the tests
results like this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 16:21:03 +00:00
Vadim Zeitlin
7d35d3ed3c Compilation fix to wxWebView under wxOSX/Carbon after r71620.
wxWindow::m_peer is private, use GetPeer() to access it.

See #14352.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 15:25:28 +00:00
Vadim Zeitlin
3e1db65507 Fix wxWebKitCtrl::RunScript() return value.
Replace comparisons of the type name of the returned value with isKindOfClass:
checks which are more reliable.

Closes #14358.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 15:25:25 +00:00
Vadim Zeitlin
2253f18176 Add support for CP1258 (Vietnamese) and CP1361 (Korean Johab) encodings.
Recognize these encodings names and translate them to/from the corresponding
charset constants in wxMSW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:46 +00:00
Vadim Zeitlin
0980e7b323 Use "GBK" as alternative name for CP936 encoding.
This is the official name of this encoding, so recognize it as synonym.

See #14360.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:37 +00:00
Vadim Zeitlin
4e116788a2 Use float instead of double division in wxHashMap code.
We don't need double precision for determining the hash table fill rate and
using double constant also results in float-to-double promotion warnings from
gcc 4.7.

See #14362.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:34 +00:00
Vadim Zeitlin
3ceb10b162 Keep user-set wxFrame background color even if MSW system background changes.
Don't override wxFrame background colour when the system background colour
changes if it was explicitly set by the user.

Closes #14364.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:31 +00:00
Vadim Zeitlin
fb040ec186 Update old selections after clearing wxListBox in wxGTK.
Don't keep stale selected item indices in m_oldSelections after clearing the
listbox, call UpdateOldSelections() from DoClear() in wxGTK just as we do in
the other ports.

Closes #14359.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:28 +00:00
Vadim Zeitlin
80a4659776 Use wxCLASSINFO() instead of deprecated CLASSINFO().
No real changes, just use the version of the macro with a "wx" prefix.

Closes #14356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:24 +00:00