AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
53,563 Commits 1 Branch 0 Tags 297 MiB
abcb9c6e58
Commit Graph

53563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Smart
abcb9c6e58 Fix duplicate variable for VC++ 6 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-22 11:27:44 +00:00
Julian Smart
62f9f10d92 Rename identifier 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-22 11:26:46 +00:00
Steve Lamerton
33baee46ee Add new sample project files. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-22 09:21:16 +00:00
Steve Lamerton
98d689e403 Rebake 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-22 09:16:48 +00:00
Steve Lamerton
2703a31ac8 Export a couple of carbon functions so that shared builds in carbon compile correctly. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-22 08:45:25 +00:00
Steve Lamerton
ce88a107ad Fix history when using custom schemes in GTK. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-20 14:04:28 +00:00
Steve Lamerton
5b91ac0603 Add virtual destructors to fix GCC4 warnings. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-20 10:59:09 +00:00
Steve Lamerton
392594bb41 Another compilation fix for OSX 10.5 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-20 09:50:00 +00:00
Steve Lamerton
43d53ee501 Update documentation for new library name. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-19 13:30:46 +00:00
Steve Lamerton
467d261e9d Rename web library to webview. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-19 10:45:16 +00:00
Steve Lamerton
e7aef23e7b Rename wxUSE_WEB to wxUSE_WEBVIEW to reflect that actually it specifically toggles the wxWebView class and associated features. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-19 09:15:06 +00:00
Steve Lamerton
000a9e77b0 Remove a couple of unused forward declarations. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-18 13:29:16 +00:00
Steve Lamerton
74a8f67d96 Add some version checks to help compiling on OSX. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-18 10:51:57 +00:00
Steve Lamerton
39ab701469 Remove MoveWindow method. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-18 09:26:52 +00:00
Steve Lamerton
6849a4b714 Return true by default under OSX WebKit. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-17 13:50:01 +00:00
Steve Lamerton
0e830c7c52 Correctly stop the loading animation in the sample when we veto navigation. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-17 13:46:09 +00:00
Steve Lamerton
3225a4b8b8 Derive wxWebViewEvent from wxNotifyEvent. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-17 11:19:29 +00:00
Steve Lamerton
4d0dddc7ad Rename LoadUrl to LoadURL. This corrects the capitalisation as it is an acronym, and brings it into line with GetCurrentURL. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-17 10:55:59 +00:00
Steve Lamerton
9af5122202 Tidy up webview.h. Remove all of the doxygen comments which have now been moved to the interface file. Organise method declarations more sensibly. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-17 10:49:17 +00:00
Steve Lamerton
fba4c7c91b Make a few internal methods private. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-17 10:36:14 +00:00
Steve Lamerton
e669ddde23 Const correct the wxWebView api. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-17 10:26:09 +00:00
Steve Lamerton
49f07becce Add a menu item linking to a custom scheme example. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-15 13:10:34 +00:00
Steve Lamerton
6b366b9929 Update bakefile for new header names. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-15 12:37:05 +00:00
Steve Lamerton
c13d6ac1ea Rename wxWebHistoryItem to wxWebViewHistoryItem. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-15 12:31:31 +00:00
Steve Lamerton
04fa04d806 Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent to wxWebViewEvent. This makes the names more consistent with other parts of wxWidgets. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-15 11:03:26 +00:00
Steve Lamerton
9f72fa7c2d Add missing bakefile from previous commit. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-14 12:25:44 +00:00
Steve Lamerton
7d8d6163ad Rename wxWebFileHandler to wxWebViewArchiveHandler, wxWebHandler to wxWebViewHandler. Update the documentation and the sample. Add a constructor taking a wxString to specify the scheme in wxWebViewHandler. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-14 12:15:34 +00:00
Steve Lamerton
3beb50e570 Merge in from trunk r68626 - r68683 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-13 16:01:47 +00:00
Steve Lamerton
603cfe4218 Add various selection menu items to the sample. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-13 15:45:39 +00:00
Steve Lamerton
54883129ae Add Run Script menu option to the sample. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-13 14:53:46 +00:00
Steve Lamerton
10ad4ba669 Add history list to the sample. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-13 14:11:32 +00:00
Vadim Zeitlin
9f4e2e269c Fix bitmap position attribute name in XRC handler. 
Bitmap position attribute was called "bitmapposition" in the documentation and
in the code that generated an error message for a wrong value in it but was
inexplicably called "direction" in the code that really looked it up.

This seems to be just a straight typo from the original r61065. Surprising as
it is that it wasn't noticed before, do correct it now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-13 13:54:26 +00:00
Steve Lamerton
70544c1e6c Call Dismiss rather than Show(false) on the infobar to correct the layout. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-13 10:07:03 +00:00
Steve Lamerton
013cda40d8 Fix loading history items under GTK. The wrong function was being used. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-13 09:41:50 +00:00
Vadim Zeitlin
f23b8c0d85 No changes, just remove gratuitous inefficiency from generic wxDVC. 
Don't return wxDataViewMainWindow::m_selection array by value, returning a
const reference to it is enough and avoids completely unnecessary memory
allocations and copying of potentially large amounts of data.

Also make wxDataViewMainWindow::GetSelections() const.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-12 14:09:41 +00:00
Vadim Zeitlin
3823a15e2c Fix compilation of generic wxDVC code when not using STL containers. 
wx sorted containers don't implement iterators so use indices to iterate over
wxDataViewMainWindow::m_selection, just as r68613 already did in another place.

Closes #13388.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-12 14:09:37 +00:00
Steve Lamerton
fe104ff925 Update documentation about custom schemes and virtual file systems. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-12 10:49:52 +00:00
Steve Lamerton
f239a20092 Fix history in wxWebViewIE when using a custom file scheme. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-12 10:44:50 +00:00
Steve Lamerton
eea4d01c65 Use the data scheme to load resources in the WebKitGTK+ implementation, rather than temporary files. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-12 09:35:41 +00:00
Paul Cornett
f795e58659 remove unneeded gdk_window_get_pointer() call 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-12 05:45:59 +00:00
Paul Cornett
803a1b9454 pass proper window to gdk_window_get_pointer(), NULL does not work with GTK3 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-12 05:33:59 +00:00
Steve Lamerton
5e3e62bc6e Add support for custom scheme handling and virtual file systems to the OSX WebKit implementation. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-11 18:56:13 +00:00
Steve Lamerton
1c29aacad8 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 2011-08-11 12:21:47 +00:00
Vadim Zeitlin
f8a1c5715f Use separate strings for stock labels with and without mnemonics. 
Obtaining the string without mnemonics by simply removing "&" characters from
the string containing mnemonics doesn't work for some languages, notably
Chinese where the convention is to use "Chinese Text (&M)" for the labels with
"M" being the ASCII mnemonic and just "Chinese Text" and not "Chinese Text (M)"
should be used if wxSTOCK_WITH_MNEMONIC flag is not specified.

Fix the fundamental problem by using separate strings for the two cases.
Translations still need to be updated to really correct the labels appearance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-11 10:56:05 +00:00
Steve Lamerton
abd474ea63 Fix typo in last commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-11 10:54:02 +00:00
Steve Lamerton
d2e66707de Rename delegates to try and stop name clashes, probably with wxWebKitCtrl. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-11 10:49:50 +00:00
Stefan Csomor
b8a14a1708 adjusting include styles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-11 08:43:38 +00:00
Stefan Csomor
407f216223 adjusting include styles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-11 08:43:13 +00:00
Stefan Csomor
2e14066008 fixing osx_carbon 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-11 08:42:39 +00:00
Stefan Csomor
59cb255555 fixing osx_cocoa, there's a reason m_peer is private in the base class 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-11 08:24:26 +00:00