19068 2008-05-14 20:06:11 -0700 wx-ize wxWebView 2008-05-28 13:28:55 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) All All RESOLVED FIXED Wx P2 Normal --- 1 robin webkit-unassigned kevino oldest_to_newest 80446 0 robin 2008-05-14 20:06:11 -0700 This patch tweaks the wxWebView class to make it conform to normal wx patterns for widget classes. It adds a default ctor and the Create method so it can use the 2-phase create pattern, adds wxRTTI macros which is important for wxPython and XRC, and fixes the LoadURL method to pass a wxString reference to save a copy. 80447 1 21152 robin 2008-05-14 20:06:48 -0700 Created attachment 21152 wx-ize wxWebView 81778 2 kevino 2008-05-28 13:28:55 -0700 Landed in r34181, thanks! 21152 2008-05-14 20:06:48 -0700 2008-05-28 13:24:37 -0700 wx-ize wxWebView webkit-webview-wxized.patch text/plain 4796 robin SW5kZXg6IC9wcm9qZWN0cy93ay9XZWJLaXQvV2ViS2l0L3d4L1dlYlZpZXcuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSAvcHJvamVjdHMvd2svV2ViS2l0L1dlYktpdC93eC9XZWJWaWV3LmgJKHJldmlzaW9uIDMz MDM3KQorKysgL3Byb2plY3RzL3drL1dlYktpdC9XZWJLaXQvd3gvV2ViVmlldy5oCSh3b3JraW5n IGNvcHkpCkBAIC01NSwyOCArNTUsNDYgQEAKICNkZWZpbmUgV1hETExJTVBFWFBfV0VCS0lUCiAj ZW5kaWYgLy8gU1dJRwogCitleHRlcm4gV1hETExJTVBFWFBfV0VCS0lUIGNvbnN0IHd4Q2hhciog d3hXZWJWaWV3TmFtZVN0cjsKKwogY2xhc3MgV1hETExJTVBFWFBfV0VCS0lUIHd4V2ViVmlldyA6 IHB1YmxpYyB3eFdpbmRvdwogewogICAgIC8vIENocm9tZUNsaWVudFd4IG5lZWRzIHRvIGdldCB0 aGUgUGFnZSogc3RvcmVkIGJ5IHRoZSB3eFdlYlZpZXcKICAgICAvLyBmb3IgdGhlIGNyZWF0ZVdp bmRvdyBmdW5jdGlvbi4gCiAgICAgZnJpZW5kIGNsYXNzIFdlYkNvcmU6OkNocm9tZUNsaWVudFd4 OwogICAgIGZyaWVuZCBjbGFzcyBXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFd4OwotICAgIAor CiBwdWJsaWM6CiAgICAgLy8gY3RvcihzKQogI2lmIFNXSUcKLSAgICAlcHl0aG9uQXBwZW5kIHd4 V2ViVmlldyAic2VsZi5fc2V0T09SSW5mbyhzZWxmKSIKKyAgICAlcHl0aG9uQXBwZW5kIHd4V2Vi VmlldyAgICAic2VsZi5fc2V0T09SSW5mbyhzZWxmKSIKKyAgICAlcHl0aG9uQXBwZW5kIHd4V2Vi VmlldygpICAiIgogI2VuZGlmCisKICAgICB3eFdlYlZpZXcod3hXaW5kb3cqIHBhcmVudCwgaW50 IGlkID0gd3hJRF9BTlksCisgICAgICAgICAgICAgIGNvbnN0IHd4UG9pbnQmIHBvaW50ID0gd3hE ZWZhdWx0UG9zaXRpb24sCisgICAgICAgICAgICAgIGNvbnN0IHd4U2l6ZSYgc2l6ZSA9IHd4RGVm YXVsdFNpemUsCisgICAgICAgICAgICAgIGxvbmcgc3R5bGUgPSAwLAorICAgICAgICAgICAgICBj b25zdCB3eFN0cmluZyYgbmFtZSA9IHd4V2ViVmlld05hbWVTdHIsCisgICAgICAgICAgICAgIFdl YlZpZXdGcmFtZURhdGEqIGRhdGEgPSBOVUxMKTsgLy8gRm9yIHd4V2ViVmlldyBpbnRlcm5hbCBk YXRhIHBhc3NpbmcKKyNpZiBTV0lHCisgICAgJXJlbmFtZShQcmVXZWJWaWV3KSB3eFdlYlZpZXco KTsKKyNlbHNlCisgICAgd3hXZWJWaWV3KCk7CisjZW5kaWYKKyAgICAKKyAgICBib29sIENyZWF0 ZSh3eFdpbmRvdyogcGFyZW50LCBpbnQgaWQgPSB3eElEX0FOWSwKICAgICAgICAgICAgICAgICBj b25zdCB3eFBvaW50JiBwb2ludCA9IHd4RGVmYXVsdFBvc2l0aW9uLAogICAgICAgICAgICAgICAg IGNvbnN0IHd4U2l6ZSYgc2l6ZSA9IHd4RGVmYXVsdFNpemUsCisgICAgICAgICAgICAgICAgbG9u ZyBzdHlsZSA9IDAsCisgICAgICAgICAgICAgICAgY29uc3Qgd3hTdHJpbmcmIG5hbWUgPSB3eFdl YlZpZXdOYW1lU3RyLAogICAgICAgICAgICAgICAgIFdlYlZpZXdGcmFtZURhdGEqIGRhdGEgPSBO VUxMKTsgLy8gRm9yIHd4V2ViVmlldyBpbnRlcm5hbCBkYXRhIHBhc3NpbmcKLQorICAgIAogI2lm bmRlZiBTV0lHCiAgICAgfnd4V2ViVmlldygpOwogI2VuZGlmCiAgICAgCi0gICAgdm9pZCBMb2Fk VVJMKHd4U3RyaW5nIHVybCk7CisgICAgdm9pZCBMb2FkVVJMKGNvbnN0IHd4U3RyaW5nJiB1cmwp OwogICAgIGJvb2wgR29CYWNrKCk7CiAgICAgYm9vbCBHb0ZvcndhcmQoKTsKICAgICB2b2lkIFN0 b3AoKTsKQEAgLTEyOCw2ICsxNDYsNyBAQAogICAgIC8vIGFueSBjbGFzcyB3aXNoaW5nIHRvIHBy b2Nlc3Mgd3hXaW5kb3dzIGV2ZW50cyBtdXN0IHVzZSB0aGlzIG1hY3JvCiAjaWZuZGVmIFNXSUcK ICAgICBERUNMQVJFX0VWRU5UX1RBQkxFKCkKKyAgICBERUNMQVJFX0RZTkFNSUNfQ0xBU1Mod3hX ZWJWaWV3KQogI2VuZGlmCiAgICAgZmxvYXQgbV90ZXh0TWFnbmlmaWVyOwogICAgIGJvb2wgbV9p c0VkaXRhYmxlOwpAQCAtMjQ3LDEyICsyNjYsMTUgQEAKIHB1YmxpYzoKICAgICB3eFN0cmluZyBH ZXRVUkwoKSBjb25zdCB7IHJldHVybiBtX3VybDsgfQogICAgIHZvaWQgU2V0VVJMKGNvbnN0IHd4 U3RyaW5nJiB1cmwpIHsgbV91cmwgPSB1cmw7IH0KKyAgICB3eFN0cmluZyBHZXRUYXJnZXROYW1l KCkgY29uc3QgeyByZXR1cm4gbV90YXJnZXROYW1lOyB9CisgICAgdm9pZCBTZXRUYXJnZXROYW1l KGNvbnN0IHd4U3RyaW5nJiBuYW1lKSB7IG1fdGFyZ2V0TmFtZSA9IG5hbWU7IH0KIAogICAgIHd4 V2ViVmlld05ld1dpbmRvd0V2ZW50KCB3eFdpbmRvdyogd2luID0gc3RhdGljX2Nhc3Q8d3hXaW5k b3cqPihOVUxMKSk7CiAgICAgd3hFdmVudCAqQ2xvbmUodm9pZCkgY29uc3QgeyByZXR1cm4gbmV3 IHd4V2ViVmlld05ld1dpbmRvd0V2ZW50KCp0aGlzKTsgfQogCiBwcml2YXRlOgogICAgIHd4U3Ry aW5nIG1fdXJsOworICAgIHd4U3RyaW5nIG1fdGFyZ2V0TmFtZTsKIH07CiAKIGNsYXNzIFdYRExM SU1QRVhQX1dFQktJVCB3eFdlYlZpZXdSaWdodENsaWNrRXZlbnQgOiBwdWJsaWMgd3hDb21tYW5k RXZlbnQKSW5kZXg6IC9wcm9qZWN0cy93ay9XZWJLaXQvV2ViS2l0L3d4L1dlYlZpZXcuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIC9wcm9qZWN0cy93ay9XZWJLaXQvV2ViS2l0L3d4L1dlYlZpZXcuY3BwCShy ZXZpc2lvbiAzMzAzNykKKysrIC9wcm9qZWN0cy93ay9XZWJLaXQvV2ViS2l0L3d4L1dlYlZpZXcu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzUsMTcgKzE4Nyw0MiBAQAogICAgIEVWVF9BQ1RJVkFU RSh3eFdlYlZpZXc6Ok9uQWN0aXZhdGUpCiBFTkRfRVZFTlRfVEFCTEUoKQogCitJTVBMRU1FTlRf RFlOQU1JQ19DTEFTUyh3eFdlYlZpZXcsIHd4V2luZG93KQorCitjb25zdCB3eENoYXIqIHd4V2Vi Vmlld05hbWVTdHIgPSB3eFQoIndlYlZpZXciKTsKKword3hXZWJWaWV3Ojp3eFdlYlZpZXcoKSA6 CisgICAgbV90ZXh0TWFnbmlmaWVyKDEuMCksCisgICAgbV9pc0VkaXRhYmxlKGZhbHNlKSwKKyAg ICBtX2lzSW5pdGlhbGl6ZWQoZmFsc2UpLAorICAgIG1fYmVpbmdEZXN0cm95ZWQoZmFsc2UpLAor ICAgIG1fdGl0bGUod3hFbXB0eVN0cmluZykKK3sKK30KKwogd3hXZWJWaWV3Ojp3eFdlYlZpZXco d3hXaW5kb3cqIHBhcmVudCwgaW50IGlkLCBjb25zdCB3eFBvaW50JiBwb3NpdGlvbiwgCi0gICAg ICAgICAgICAgICAgICAgIGNvbnN0IHd4U2l6ZSYgc2l6ZSwgV2ViVmlld0ZyYW1lRGF0YSogZGF0 YSkgOgorICAgICAgICAgICAgICAgICAgICAgY29uc3Qgd3hTaXplJiBzaXplLCBsb25nIHN0eWxl LCBjb25zdCB3eFN0cmluZyYgbmFtZSwKKyAgICAgICAgICAgICAgICAgICAgIFdlYlZpZXdGcmFt ZURhdGEqIGRhdGEpIDoKICAgICBtX3RleHRNYWduaWZpZXIoMS4wKSwKICAgICBtX2lzRWRpdGFi bGUoZmFsc2UpLAogICAgIG1faXNJbml0aWFsaXplZChmYWxzZSksCiAgICAgbV9iZWluZ0Rlc3Ry b3llZChmYWxzZSksCiAgICAgbV90aXRsZSh3eEVtcHR5U3RyaW5nKQogewotICAgIGlmICghd3hX aW5kb3c6OkNyZWF0ZShwYXJlbnQsIGlkLCBwb3NpdGlvbiwgc2l6ZSwgd3hCT1JERVJfTk9ORSB8 IHd4SFNDUk9MTCB8IHd4VlNDUk9MTCkpCi0gICAgICAgIHJldHVybjsKKyAgICBDcmVhdGUocGFy ZW50LCBpZCwgcG9zaXRpb24sIHNpemUsIHN0eWxlLCBuYW1lLCBkYXRhKTsKK30KIAorYm9vbCB3 eFdlYlZpZXc6OkNyZWF0ZSh3eFdpbmRvdyogcGFyZW50LCBpbnQgaWQsIGNvbnN0IHd4UG9pbnQm IHBvc2l0aW9uLCAKKyAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qgd3hTaXplJiBzaXplLCBs b25nIHN0eWxlLCBjb25zdCB3eFN0cmluZyYgbmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAg V2ViVmlld0ZyYW1lRGF0YSogZGF0YSkKK3sKKyAgICBpZiAoIChzdHlsZSAmIHd4Qk9SREVSX01B U0spID09IDApCisgICAgICAgIHN0eWxlIHw9IHd4Qk9SREVSX05PTkU7CisgICAgc3R5bGUgfD0g d3hIU0NST0xMIHwgd3hWU0NST0xMOworICAgIAorICAgIGlmICghd3hXaW5kb3c6OkNyZWF0ZShw YXJlbnQsIGlkLCBwb3NpdGlvbiwgc2l6ZSwgc3R5bGUsIG5hbWUpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKIC8vIFRoaXMgaXMgbmVjZXNzYXJ5IGJlY2F1c2Ugd2UgYXJlIHVzaW5nIFNoYXJl ZFRpbWVyV2luLmNwcCBvbiBXaW5kb3dzLAogLy8gZHVlIHRvIGEgcHJvYmxlbSB3aXRoIGV4Y2Vw dGlvbnMgZ2V0dGluZyBlYXRlbiB3aGVuIHVzaW5nIHRoZSBjYWxsYmFjawogLy8gYXBwcm9hY2gg dG8gdGltZXJzICh3aGljaCB3eCBpdHNlbGYgdXNlcykuCkBAIC0yNDAsNiArMjc3LDggQEAKICAg ICBzZXR0aW5ncy0+c2V0SmF2YVNjcmlwdEVuYWJsZWQodHJ1ZSk7CiAKICAgICBtX2lzSW5pdGlh bGl6ZWQgPSB0cnVlOworCisgICAgcmV0dXJuIHRydWU7CiB9CiAKIHd4V2ViVmlldzo6fnd4V2Vi VmlldygpCkBAIC0zMjYsNyArMzY1LDcgQEAKICAgICByZXR1cm4gcmV0dXJuVmFsdWU7CiB9CiAK LXZvaWQgd3hXZWJWaWV3OjpMb2FkVVJMKHd4U3RyaW5nIHVybCkKK3ZvaWQgd3hXZWJWaWV3OjpM b2FkVVJMKGNvbnN0IHd4U3RyaW5nJiB1cmwpCiB7CiAgICAgaWYgKG1faW1wbC0+ZnJhbWUgJiYg bV9pbXBsLT5mcmFtZS0+bG9hZGVyKCkpIHsKICAgICAgICAgV2ViQ29yZTo6S1VSTCBrdXJsID0g V2ViQ29yZTo6S1VSTChzdGF0aWNfY2FzdDxjb25zdCBjaGFyKj4odXJsLm1iX3N0cih3eENvbnZV VEY4KSkpOwo=