Commit Graph

56447 Commits

Author SHA1 Message Date
Vadim Zeitlin
68a335b43b Relax Unity menu interdiction hack to allow popup menus in modal dialogs.
The changes of r73007 fixed the problem with menus remaining active while a
modal dialog was shown (see #14823) but also disabled processing of the events
from any popup menus shown by the dialog itself. Reallow the latter while
still forbidding the former now by checking whether the window associated with
the menu is the dialog itself.

Closes #14961.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-12 03:09:06 +00:00
Vadim Zeitlin
6884a3b643 Fix a typo in wxKeyEvent::GetKeyCode() code example.
Add missing object to the method call.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-10 17:59:13 +00:00
Paul Cornett
4116bc7edd call GTKApplyWidgetStyle() from PostCreation() instead of GTKHandleRealized()
it's a better place to catch font or color changes made before creation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-10 07:17:01 +00:00
Paul Cornett
92ef38ee6b allow setting window font and bg/fg color before creation
wxMSW and wxOSX don't have a problem with it, so neither should wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-10 06:53:14 +00:00
Paul Cornett
b387025d5d simplify code setting backing pixmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-10 06:28:18 +00:00
Steve Lamerton
d377092637 Add HTTP status code definitions to attempt to fix VC6 compilation following #73325.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-09 20:27:48 +00:00
Paul Cornett
18ca66650a don't use deprecated wxMouseState functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-09 03:27:11 +00:00
Julian Smart
f5613c9b12 Detect when the window is still captured when dragging was aborted for some reason
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-08 10:25:01 +00:00
Julian Smart
52682336e8 Fill in mouse button and key state when generating mouse event for auto scrolling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-08 10:20:55 +00:00
Paul Cornett
f4120538eb define wxComboBox rtti stuff even when wxUSE_COMBOCTRL==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-05 05:08:43 +00:00
Vadim Zeitlin
a246ab8b5e Attempt to fix MSVC6 compilation after the previous commit.
Include <shlobj.h> before our wx/msw/missing.h, otherwise many things were
redefined.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-04 22:14:47 +00:00
Vadim Zeitlin
6fdda829b4 Including wx/msw/missing.h to define INVALID_FILE_ATTRIBUTES for MSVC6.
This header is also needed in filename.cpp (see r73317 for a previous commit
fixing the same problem in filefn.cpp).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-04 20:13:03 +00:00
Vadim Zeitlin
83c0a84c8c Re-lay out the grid sample window after auto-sizing the grid.
Changing the size of the grid without updating the sizer resulted in
overlapping windows and a mess on the display.

Closes #14948.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-03 20:47:18 +00:00
Paul Cornett
2a9332ae2c gtk_assert_dialog_set_message() was unintentionally excluded in r73163
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-03 16:43:40 +00:00
Jouk Jansen
3a0c6eff1b gtk_assert_dialog_set_message is only defined if wxUSE_STACKWALKER is set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-03 15:19:01 +00:00
Paul Cornett
89e5d5bbc4 use gtk_file_chooser_set_show_hidden() now that GTK 2.6 is required
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-03 06:09:43 +00:00
Paul Cornett
ddb19489c0 remove ancient SetModal(), it was deprecated long ago and is not present in wxMSW or wxOSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-03 05:09:20 +00:00
Paul Cornett
b873ba78fd look for backtrace() in -lexecinfo, fixes #14942
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-02 18:11:30 +00:00
Vadim Zeitlin
efcdfeafce Chinese translations update from William Jiang.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-02 16:41:41 +00:00
Vadim Zeitlin
103df4a1b0 Slight improvements to wxWebView::EnableContextMenu() documentation.
Explain that the menu is enabled by default so the main use of this method is
to disable it.

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

And mention this in the changelog.

See #14789.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-31 13:40:17 +00:00
Steve Lamerton
c420d57be0 Add context menu enabling and disabling to wxWebView, all backends supported.
Closes #14789.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-31 13:21:21 +00:00
Steve Lamerton
c13815810e Add handling of http errors to wxWebViewIE. Tidy up existing large case statement.
Closes #14877.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-30 20:19:58 +00:00
Vadim Zeitlin
04a6ed3efd Slovenian translations update from Martin Srebotnjak.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 23:47:03 +00:00
Vadim Zeitlin
7582edfbf9 Fix wxLocale::GetInfo() in C locale under Windows.
Don't use LOCALE_USER_DEFAULT when the locale hadn't been changed because the
user default locale often (and maybe even always) is different from "C" locale
used by the CRT resulting in mismatch between the conventions used by
wxDateTime::Format(), which uses the CRT locale, and wxDateTime::Parse(),
which uses Windows format. Instead use the hard-coded values corresponding to
the "C" locale to ensure we use the same values as the CRT in this case.

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

Closes #14918.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 21:53:13 +00:00
Vadim Zeitlin
b7bd58d09a Ensure that scrollbars are shown in scrolled popup in the popup sample.
Don't call SetScrollbars(), this is overridden by sizer logic later. Instead,
add a sufficiently big window to the popup and make fix the size of the popup
itself to be smaller to ensure that the scrollbars do show.

Closes #14900.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 21:53:09 +00:00
Vadim Zeitlin
ef68861e11 No changes, just fix unused variable in wxUSE_STATBMP==0 build.
Move the condition used only for wxStaticBitmap positioning inside "#if
wxUSE_STATBMP" section.

Closes #14929.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 21:53:05 +00:00
Vadim Zeitlin
bbd65f8df7 Including wx/msw/missing.h to define INVALID_FILE_ATTRIBUTES for MSVC6.
This should fix the remaining problem in VC6 build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 21:53:03 +00:00
Vadim Zeitlin
1084433147 No changes, just remove unneeded variable initialization.
Don't initialize htmlWindowBorder in wxHtmlHelpWindow::Create() just to
overwrite it with another value on the next line.

Closes #14933.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 20:15:50 +00:00
Vadim Zeitlin
2392a466b2 Spelling fixes in comments in wxOSX.
No real changes.

Closes #14932.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 20:15:44 +00:00
Paul Cornett
4011652414 reference count the GtkMenuItem in wxMenuItem as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 07:07:29 +00:00
Paul Cornett
bf487502d9 make GTKNeedsParent() private
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 06:29:52 +00:00
Paul Cornett
f1a3ae7dc9 m_menubar does not need to be public for hildon, it's the same as m_widget in that case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 06:21:01 +00:00
Robin Dunn
dec0a353ff Fix missing or broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-29 02:32:16 +00:00
Paul Cornett
bb3a9c6dee use wxDEPRECATED_CONSTRUCTOR() instead of inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 18:38:55 +00:00
Paul Cornett
51623cc53f remove unused variable assignment, closes #14928
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 17:04:01 +00:00
Paul Cornett
9166fbf48a Use gtk_menu_item_remove_submenu() with GTK2
because gtk_menu_item_set_submenu() with NULL menu argument does not work
before GTK 2.12 and there is no need to avoid calling it on later GTK2 versions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:56:01 +00:00
Vadim Zeitlin
5d79e64a00 Suppress warning about _set_se_translator() for VC++ 10 and 11 too.
Previously we disabled this warning for VC versions up to 9 but the warning
still seems to be as harmless as before for the newer versions too.

Closes #13607.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:03:24 +00:00
Vadim Zeitlin
98c9096992 Don't assume that wxTE_RICH(2) implies wxTE_MULTILINE for wxTextCtrl in wxOSX.
Under MSW single line text controls can still use these styles, so don't
assume that the control should be made multi-line just because one of them is
specified.

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

Closes #11681.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:03:20 +00:00
Vadim Zeitlin
f69306fe61 Process HDN_TRACK in wxMSW wxHeaderCtrl just in case.
This message is not supposed to be sent but apparently some buggy comctl32.dll
versions do send it instead of HDN_ITEMCHANGING, so handle it too.

Closes #13506.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:03:16 +00:00
Vadim Zeitlin
31a1584724 Don't call wxTextMeasure::BeginMeasuring() when using non-native wxDC.
This is useless as we don't use wxTextMeasure in this case but just forward to
the wxDC itself, and also results in an assert in wxMSW wxTextMeasure
implementation.

Closes #14916.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:03:12 +00:00
Vadim Zeitlin
c59fb496ea Parse files from include/wx/*.h when making wxMSW tags.
Fix missing wxTextMeasure &c in wxMSW tags.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:03:09 +00:00
Vadim Zeitlin
d48f13a168 Allow building wxGTK under Windows with MSVC.
Replace a few more __WXMSW__ tests with __WINDOWS__ ones and modify bakefiles
to allow specifying the toolkit to be built in wxMSW makefiles.

Closes #13902.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:03:03 +00:00
Vadim Zeitlin
91270d2d17 Remove connection of MyDllApp::OnIdle() handler in the dll sample.
This method didn't really exist, the code only worked because it connected to
wxApp::OnIdle() which exists in wxMSW but not the other ports.

Simply remove the apparently unnecessary call.

See #13902.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:02:11 +00:00
Vadim Zeitlin
5160f2929d No changes, just avoid unused variable in wxUSE_TOOLTIPS==0 build.
Move the declaration of a variable only used for tooltip setting inside "#if
wxUSE_TOOLTIPS" test.

Closes #14927.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:02:07 +00:00
Vadim Zeitlin
3b4b952d42 Use a single taskbar icon for all notifications in wxMSW.
Allocating a new icon for every notification could result in showing many
identical icons in the taskbar notification area if several notification
messages were generated which looked like a bug to the user. It was also
inconsistent with the behaviour in the case when UseTaskBarIcon() was called.

Always behave as in the latter case now, i.e. any subsequent notification
replaces the previous one instead of being shown in addition to it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:02:04 +00:00
Vadim Zeitlin
0a890608f1 Remove extra "#" operator in wxFAIL_COND_MSG macro.
The argument of this macro is already a string, so we don't need to stringify
it again.

This fixes VC6 build, unlike all the other compilers this one didn't apply "#"
to an argument which was already a quoted string correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 16:01:59 +00:00
Stefan Csomor
2e7ad0644c silence unused var warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 13:15:08 +00:00
Paul Cornett
929bb9d2b3 non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 01:50:33 +00:00
Vadim Zeitlin
ff8af61ce0 Fix regression with wxHTML table elements background handling.
Wrong background was used for the text inside HTML tables since r72589, fix
this by setting the correct background before processing the table elements
and restoring it after doing it.

Closes #14909.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 00:44:13 +00:00
Vadim Zeitlin
dee05929ba Ensure that client display rectangle is always less than its total area.
Under Unix we could return client display rectangle that was bigger than the
entire display size as it corresponded to the total screen size when
_NET_WORKAREA was not supported or was not correctly implemented by the WM.

Fix this by explicitly intersecting the client rect with the total one.

Closes #14419.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-28 00:44:09 +00:00