Commit Graph

54351 Commits

Author SHA1 Message Date
Stefan Neis
d0a341b34a Include some more declarations & defines.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 14:36:22 +00:00
Stefan Neis
21317c46b4 Reordered "extern" and WXDLLIMPEXP_CORE specifiers; fixes #13816.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-29 11:26:05 +00:00
Vadim Zeitlin
bde56d09bb Restore wxEVT_MENU_CLOSE generation under Windows 95 after r70151.
WM_UNINITMENUPOPUP is "only" available since Windows 98/2000 so restore the
old code using WM_EXITMENULOOP as fall back, just to avoid any regressions for
people who might still be using these systems.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 17:47:21 +00:00
Vadim Zeitlin
abb8764e32 Compilation fix for VC6 after r70151.
VC6 standard SDK didn't define WM_UNINITMENUPOPUP, so define it for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 17:32:32 +00:00
Vadim Zeitlin
0d68cd1359 Add standard art providers at the bottom of the art providers stack.
This ensures that any user-defined art providers will be in front of them,
even when they are added at module-initialization time i.e. possibly before
the standard ones.

Closes #12519.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:29 +00:00
Vadim Zeitlin
91452726c2 Use best controller size in wxBookCtrl best size calculation.
Don't use GetControllerSize() which returns the actual, not the best, size of
the controller.

Closes #11793.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:25 +00:00
Vadim Zeitlin
d159e96495 Improve layout in the samples to avoid problems under Mac.
Changes the samples to look better under Mac and avoid the worst problems such
as overlapping buttons or truncated controls.

Closes #11651.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:21 +00:00
Vadim Zeitlin
7f3f059ac5 Complete wxEVT_MENU_{OPEN,CLOSE} implementation in wxMSW and wxOSX.
Set the wxMenu correctly for wxEVT_MENU_CLOSE events in wxMSW.

Set the menu id correctly to allow wxMenuEvent::IsPopup() to work for both
wxEVT_MENU_OPEN and wxEVT_MENU_CLOSE in wxOSX.

Closes #11313.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:17 +00:00
Vadim Zeitlin
c2cd367f7d Use memmove() instead of memcpy() in wxString::AssignCopy().
This at least allows the code like "s = s.c_str()" to work correctly when
using our own wxString implementation, even it doesn't fix all
self-assignment-related bugs (again, when using our own implementation only,
there is no bug when using std::basic_string as underlying implementation).

This is a cherry pick of r63008 from 2.8 branch.

See #11245.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:13 +00:00
Steve Lamerton
d296f9a114 Disable final failing wxWebView test. It fails on the buildbot but not locally.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 10:01:05 +00:00
Vadim Zeitlin
f79f06665c Compilation fix for PCH-less build after r70122.
Include the header declaring wxClientDC.

Closes #13809.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 17:32:29 +00:00
Vadim Zeitlin
1b47b78407 Compilation fix for wxUniv/X11 with wxUSE_STL==1.
Don't rely on implicit conversion from wxString to wchar_t*.

Closes #13790.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:50 +00:00
Vadim Zeitlin
59060c07b4 Update the value of read-only wxComboBox in wxUniv.
Fix regression in combobox appearance: it never showed the selected value when
it was read-only any more.

Closes #13688.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:46 +00:00
Vadim Zeitlin
7eff714407 Fix warning about non-virtual dtor in wxDataViewCtrlInternal.
This class doesn't need a virtual dtor but g++ warned about its absence
because it unnecessarily defined a virtual method. Just make this method
non-virtual to avoid the warning.

Closes #13395.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:43 +00:00
Vadim Zeitlin
6549dd3ce3 Suppress gcc -Wint-to-pointer-cast warnings in GTK wxDataViewCtrl.
Use wxUIntToPtr to avoid the warnings about casts from smaller (in 64 bit
build) int type to pointer.

Closes #13394.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:39 +00:00
Vadim Zeitlin
7716a165ef Don't use deprecated wxArtProvider::Insert().
Ironically, it was 2.6 compatibility code that was using the function
deprecated after 2.8. In any case, just use the newest name for it.

Closes #13393.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:36 +00:00
Vadim Zeitlin
e170515a9b Fix the size of the font returned by wxTextCtrl::GetStyle() in MSW.
CHARFORMAT stores height in 1/20th of a point, not pixels. Add the correct
conversion to the units used by LOGFONT.

See #13384.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:33 +00:00
Vadim Zeitlin
c7155388f5 Recognize background-color style in wxHtmlWindow.
Just treat it as a synonym for "background" i.e. the same as HTML3 BGCOLOR.

Closes #13173.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:29 +00:00
Vadim Zeitlin
3e65f74e18 Add support for more CSS styles to SPAN tag in wxHtmlWindow.
Add limited support font-family, font-style and text-decoration.

Closes #13170.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-27 01:21:26 +00:00
Vadim Zeitlin
d130167576 Increase the tolerance in wxStopWatch unit test.
Sleeping can take more time than expected when running on the build slaves,
probably because the machine is heavily loaded. Increase the tolerance to
prevent this from resulting in test failures.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-26 12:57:49 +00:00
Julian Smart
575be97600 Applied patch in #13777 (wxRichTextCtrl scroll and delete not refreshed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-25 17:04:51 +00:00
Vadim Zeitlin
51ec29ea5d Always link with expat in monolithic build.
Fix linking errors when using wxXML in sttaic monolithic build: in this case
we must link with expat but it was listed too early, before wxWidgets
libraries using it, in the bakefile-generated makefiles.

Now add it to the end of the linker command line too by including -lexpat in
EXTRALIBS_FOR_BASE which are appended to the linker arguments.

Notice that now -lexpat is linked twice because it is still added by
<wx-lib>xml</wx-lib> in bakefiles, even in monolithic build, but I don't know
how to avoid it and it is harmless anyhow.

Closes #12573.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-25 13:28:01 +00:00
Vadim Zeitlin
4d8e8355b4 Added a warning about multi-cells in wxGrid::DeleteRows() docs.
Currently deleting rows or columns intersecting a multi-cell is simply not
supported and results in an immediate crash.

See #4238.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-25 12:52:56 +00:00
Paul Cornett
0b3b8742c5 restore call to GetTabSize removed in r69880, it is needed to set x_extent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-25 00:57:27 +00:00
Vadim Zeitlin
4a04898fe0 Really fix the use of deprecated methods in wxGrid test.
The changes of r70111 were wrong, the unit test for wxGrid really did intend
to test the deprecated methods so restore them -- but only in
WXWIN_COMPATIBILITY_2_8 case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 18:30:52 +00:00
Vadim Zeitlin
864181f4f6 Implement wxNotebook::CalcSizeFromPage() for wxGTK.
The implementation is far from perfect as it relies on hard-coded margins but
is better than nothing as it allows wxNotebook best size determination and
SetPageSize() method to work correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 18:19:26 +00:00
Vadim Zeitlin
b73da1a41b Don't use deprecated methods in wxGrid test.
Don't use the methods defined only when building 2.8-compatible mode to let
the tests compile even with WXWIN_COMPATIBILITY_2_8 off. This only worked
before because of the wrong tests in grid.h but broke after the fixes of
r70098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 17:58:32 +00:00
Paul Cornett
2861be020e remove improper use of paste operator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 16:46:26 +00:00
Vadim Zeitlin
8c167bb199 Fix fatal bug with deleting the old contents in wxScopedArray::reset().
"delete" was wrongly used instead of "delete[]".

Closes #13806.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:14 +00:00
Vadim Zeitlin
7182483bf7 Use the correct function type cast in EVT_WEBKIT_NEW_WINDOW.
Use wxWebKitNewWindowEventHandler to perform a proper static_cast<>, which
detects incorrect casts during compilation, instead of
wxWebKitNewWindowEventFunction which was just doing an unsafe C-style cast.

Cloes #13805.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:12 +00:00
Vadim Zeitlin
70ef16f4e2 Add EVT_FSWATCHER event table macro.
It was documented, and ought to have existed anyhow for consistency with
wxEVT_FSWATCHER, but wasn't defined. Do it now.

Closes #13804.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:08 +00:00
Vadim Zeitlin
a601696dd5 Add EVT_WINDOW_MODAL_DIALOG_CLOSED() event table macro.
Add it for consistency with wxEVT_WINDOW_MODAL_DIALOG_CLOSED.

See #13804.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:05 +00:00
Vadim Zeitlin
b099835e8f Fix typo in wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK in documentation.
It was misspelt as wxEVT_COMMAND_RICHTEXT_DLEFT_CLICK.

Closes #13802.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:01 +00:00
Vadim Zeitlin
f179a616c7 Remove references to defunct event types in comments.
No real changes, just complete the changes of r58039 by removing the
references to non-existent (any more) event types from the comments too.

Closes #13801.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:42:57 +00:00
Julian Smart
c1431e59e3 Applied #13803: wxRichTextCtrl: missing event-table macro (dghart)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 11:39:40 +00:00
Steve Lamerton
8a31648287 Disable some wxWebView tests that fail on the buildbot but not locally.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 10:08:37 +00:00
Steve Lamerton
b8800bfe8b Fix typo in ADD_RAW_IID macro.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 10:05:31 +00:00
Steve Lamerton
ed1c9160bf Add some extra yields to wxWebView unit tests to hopefully fix some of the failing buildbot runs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-23 19:16:47 +00:00
Paul Cornett
620e83e412 don't use deprecated function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-23 17:38:30 +00:00
Paul Cornett
7bc57fd972 fix tests for WXWIN_COMPATIBILITY_2_8, closes #13800
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-23 05:59:59 +00:00
Steve Lamerton
9f194b9de0 Use OLE helper macros in wxWebView to reduce the amount of duplicated code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 19:16:12 +00:00
Steve Lamerton
4b4ed3c942 Add new ADD_RAW_IID OLE helper macro to allow use with classes that do not start with IID_I.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 19:14:58 +00:00
Steve Lamerton
d04002224e Mark various OLE helper functions as DLL exported so they can be used from other libraries.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 19:08:43 +00:00
Paul Cornett
6041f69ca7 remove SetBackgroundStyle call from OnInternalIdle, it should be done from realize handler, closes #13799
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 18:21:41 +00:00
Vadim Zeitlin
e718eb9840 Fix wxLogFormatter compilation under MSW.
Fix wxMSW compilation after the changes of r70086.

Closes #13792.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 16:36:47 +00:00
Vadim Zeitlin
b25278d885 Dramatically optimise inserting many items in wxGenericListCtrl.
During each item insertion SetItem() was called and this resulted in a call to
GetItemRect() which, in turn, re-laid out all items in the control meaning
that the relatively expensive wxListMainWindow::RecalculatePositions() was
called N times when inserting N items.

Reduce this to just a single call by not refreshing the item in SetItem() if
everything is going to be redrawn soon anyhow.

This decreases the time needed to insert a couple of thousands of items in
icon view from several minutes to less than a second.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 14:47:54 +00:00
Vadim Zeitlin
4ffdb64018 Add wxLogFormatter to allow easier wxLog output customization.
Delegate the log string creation to wxLogFormatter. This allows defining a
custom object of a class derived from it to customize the log output instead
of having to override DoLogRecord() in wxLog itself.

Closes #13792.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 13:35:01 +00:00
Robin Dunn
2cc6b51b90 Avoid a problem in Phoenix by making UpdateMacScrollWindow not be pure virtual.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 01:26:11 +00:00
Robin Dunn
bb6eb69414 Interface fixes for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-22 01:25:18 +00:00
Stefan Csomor
034e7d7ccf rebaked Xcode proj for cocoa after date & timectrls were added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-21 16:27:43 +00:00