Steve Lamerton
94e0018723
Merge in from trunk r64802 - r68625
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 18:10:42 +00:00
Steve Lamerton
3baf235f60
Use shared pointers to hold wxWebHandlers throughout.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 15:12:33 +00:00
Vadim Zeitlin
ddae52629c
Added wxTopLevelWindow::MSWGetSystemMenu() method.
...
Also generate events corresponding to WM_SYSCOMMAND messages for the custom
items of the system menu.
Add a small snippet to test the new functionality to the dialogs sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 09:32:42 +00:00
Vadim Zeitlin
960493053b
Added private wxMenu::MSWNewFromHMENU() method.
...
Add a method allowing creation of a wxMenu object from a native menu handle.
This will be used to implement access to the system menu in an upcoming commit
but could also be useful for other purposes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-08 09:32:39 +00:00
Vadim Zeitlin
7112cdd1f3
Add support for wxHELP button to wxMessageDialog.
...
Implement support for wxHELP for wxMSW, wxGTK and wxOSX/Cocoa (at least when
showing the message box from the main thread, there doesn't seem to be any way
to show more than three buttons with CFUserNotificationDisplayAlert() so
"Help" button is not supported when using it).
This is useful not only on its own, i.e. to allow the user to ask for help,
but also because it brings the total number of buttons supported by the
message dialog to 4, meaning that more choices can be offered to the user
(which is rarely, but not quite never, useful).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 22:53:42 +00:00
Steve Lamerton
b7d3a622aa
Rework IE virtual file system support to use new syntax. Remove now unused code for resolving links ourselves, we can let the backend resolves them itself.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-03 18:31:48 +00:00
Robin Dunn
6c797d8fd1
Initialize the native printer info for ConvertFromNative if it hasn't been done already.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 19:49:02 +00:00
Julian Smart
0aeb2e3f9b
Added semicolon needed by MSVC++ 6
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-02 14:43:15 +00:00
Steve Lamerton
cddf4541fa
Add missing wxRTTI macros and fix incorrect ones.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 15:49:05 +00:00
Steve Lamerton
b7d74e9ca3
Fix remaining warnings in ie backend.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 13:20:46 +00:00
Steve Lamerton
bd7901aaec
Add missing lines to setup.h.in. This properly fixes compilation under configure based environments. Also update the include guards for the wxWebHistoryItem files.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-01 10:10:20 +00:00
Steve Lamerton
eafdb19c44
Split wxWebHistoryItem headers out into separate files for each backend. This will allow us to dramatically reduce the amount of code in the GTK history implementation and implement it and OSX history support more cleanly.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-31 14:06:33 +00:00
Steve Lamerton
9e3d4a3210
Overhaul wxWebHandler naming to try and make it consistent with the rest of wxWidgets. Split wxWebFileHandler into its own file.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 14:22:15 +00:00
Steve Lamerton
153530afb5
Add new wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED event. Implement for all backends, extend the sample to demonstrate it and document. Also update some copyright notices.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-30 11:26:55 +00:00
Vadim Zeitlin
6ce832135e
Add wxTextCtrl::PositionToCoords() functions for wxMSW and wxGTK.
...
The new method allows to find the coordinates in pixels of the given character
in a text control.
Closes #13221 .
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-29 15:11:54 +00:00
Steve Lamerton
eff8f7952e
Move the wxWebFileProtocolHandler from the IE backend to the common source, add the RegisterProtocol method to all classes (as a stub in GTK and OSX). Register the file protocol handler in the sample for testing purposes.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-28 16:49:48 +00:00
Steve Lamerton
293656292f
Initial implementation of wxWebProtocolHandler and wxWebFileProtocolHandler for the IE backend. This allows browsing of local files and files in zip archives when using a query string which specifies the protocol and path.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-28 16:08:59 +00:00
Steve Lamerton
666f73c4d6
Very basic implementation of IInternetProtocolInfo, this will allow us to correctly parse links in virtual file systems.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-26 16:11:38 +00:00
Steve Lamerton
906c935a80
Merge in from trunk r67662 to r64801
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 16:54:53 +00:00
Steve Lamerton
0995b9dc18
Fix warnings in the MSW IE backend.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 15:43:18 +00:00
Steve Lamerton
205defae89
Remove some now unused history variables.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 10:46:46 +00:00
Vadim Zeitlin
2e1cee233e
Refactor wxWindow::MSWHandleMessage() out from MSWWindowProc().
...
This commit just refactors the code without changing anything in its
behaviour and will be followed by the real changes in the next one.
The new function just handles the message, without calling MSWDefWindowProc()
if it wasn't handled. This allows to call it and determine whether the message
was really handled and only continue processing it if it wasn't.
Notice that while in theory this shouldn't be necessary because the return
value of MSWWindowProc() should indicate whether the message was handled or
not (0 meaning that it was, for most messages), in practice it doesn't work
because many standard controls window procs return 0 even for message they do
nothing with, e.g. "up down" control always returns 0 for WM_CHAR messages
even it it only really handles the arrow keys.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 12:49:22 +00:00
Steve Lamerton
7d3f6b4ded
Implement basic support for virtual file systems for the ie backend. Registering a temporary namespace allows us to use the existing wxFileSystem work to load virtual files.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 12:31:18 +00:00
Steve Lamerton
a1ee9e64a5
Replace define for OLECMDID_OPTICAL_ZOOM with an enum to avoid errors in compilers that define it as such.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 09:34:46 +00:00
Vadim Zeitlin
fb4faeb5de
Make wxEnhMetaFileDC ctor from wxDC explicit.
...
This avoids implicit conversion of any kind of wxDC to wxEnhMetaFileDC which
is totally unexpected.
See #13326 .
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-21 13:49:59 +00:00
Vadim Zeitlin
05d65177f8
Fix memory leak in wxPanel::SetBackgroundBirmap() in wxMSW.
...
The brush allocated for the bitmap was never freed, do free it in dtor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-18 19:36:31 +00:00
Julian Smart
1d7d04d77f
VC++ 6 fixes
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-16 12:13:17 +00:00
Steve Lamerton
c9ccc09c64
Add RunScript and implement on all backends. Document and add a very simple unit test.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-15 12:38:47 +00:00
Steve Lamerton
41933aa5a0
Add ClearSelection for msw ie and gtk webkit, with a stub for osx webkit. Document and add to unit tests.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-15 09:36:08 +00:00
Steve Lamerton
c5f417cb50
Overhaul IE zoom functions to support both text and optical zoom.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-14 09:58:33 +00:00
Steve Lamerton
241b769f96
Add GetPageText to MSW IE and to GTK WebKit. Add stub for OSX and document.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-13 17:25:05 +00:00
Steve Lamerton
97ba4d81a8
Rename GetSelectedHTML to GetSelectedSource, this brings it into line with GetPageSource, and also with its intended use.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-13 15:30:25 +00:00
Vadim Zeitlin
16e79d4879
Fix showing slider label in wxMSW when wxSL_MIN_MAX_LABELS was not used.
...
wxSlider with wxSL_LABELS style but without wxSL_MIN_MAX_LABELS didn't show
the current value because the width of the value label was 0.
Fix this by always computing the widths of min and max labels and using the
longest of them for the value label, even if we don't actually show them.
Closes #13291 .
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 22:49:33 +00:00
Vadim Zeitlin
5db9025368
No real changes, just make some wxSlider members local variables.
...
wxMSW wxSlider implementation stored the min and max labels widths as fields
of wxSlider object for some reason even though they were only used in one of
its methods (and can be easily computed anyhow).
Make them simple local variables instead and also rename an existing local
variable which started conflicting with their new names.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 22:49:30 +00:00
Steve Lamerton
0fe8a1b6ca
Implement GetSelectedHTML for the ie and gtk webkit backends and document.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 18:26:07 +00:00
Steve Lamerton
22ca10faec
Fix warnings in the ie backend.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-11 09:35:41 +00:00
Steve Lamerton
c9355a3df6
Add support for retrieving the currently selected text. Implement on all backends, document and unit test.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-10 18:11:43 +00:00
Steve Lamerton
63a6507091
Add start of selection api, support for HasSelection, SelectAll and DeleteSelection along with documentation. Implement for IE and WebKitGTK and add stubs for OSX WebKit.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-09 14:31:29 +00:00
Steve Lamerton
c7cbe308f6
Add the ability to enable / disable and check for the editable property of a rendering engine. Implement for all three backends and extend the sample, document and unit test.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-08 19:34:56 +00:00
Steve Lamerton
617227c309
Factor logic that returns an IHTMLDocument2 into a separate function to reduce repetition.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-04 18:46:01 +00:00
Steve Lamerton
97e49559fb
Implement undo and redo for the ie and gtk webkit backends. Extend the sample to show their use.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 15:07:46 +00:00
Steve Lamerton
4681a3ea0d
Add new clipboard api and support for it in the ie backend. Also extend the sample to demonstrate the new functions.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-02 11:45:19 +00:00
Steve Lamerton
5cbda74b66
Extend history api using the ie backend to include loading history items, and getting the backward and forward history lists.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-01 10:57:37 +00:00
Steve Lamerton
3e7968c2da
Use shared pointers throughout when managing history with the ie backend, simplifying memory management. Also add more comments explaining how the history is managed.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-01 10:01:45 +00:00
Steve Lamerton
74af0b1343
Add support for the new history functions to the ie backend. For this we manage our own history as there are no suitable built-in ways of managing it.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 19:57:26 +00:00
Steve Lamerton
152a58083f
Add basic history api and implement it under gtk.
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 10:03:25 +00:00
Vadim Zeitlin
b02d50281d
Always initialize SelectInHDC::m_hgdiobj in wxMSW.
...
Leaving m_hgdiobj uninitialized probably didn't result in any problems
considering how this class is currently used but it did result in g++ warnings
about uninitialized member with aggressive warning flags and also could easily
become a problem in the future so just ensure that we always initialize it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-29 17:50:30 +00:00
Steve Lamerton
66f2aa61c3
Update msw files to use the new definitions
...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-28 16:11:00 +00:00
Vadim Zeitlin
b4354db179
Refactor wxButton and wxToggleButton to derive from wxAnyButton.
...
Introduce wxAnyButton class, a common base class for wxButton and
wxToggleButton, allowing to reuse the same implementation for them.
This also allows to implement support for bitmaps in wxToggleButton for all
platforms and make wxBitmapToggleButton a trivial subclass of it everywhere,
similarly to wxBitmapButton and wxButton.
Closes #13198 .
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-14 13:00:42 +00:00
Vadim Zeitlin
48dd005569
Replace more DECLARE_CLASS occurrences with DECLARE_DYNAMIC_CLASS.
...
Correct more mismatches between DECLARE_CLASS and IMPLEMENT_DYNAMIC_CLASS
usage.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 16:48:36 +00:00