Changeset 32863 in webkit
- Timestamp:
- May 4, 2008 10:30:44 PM (16 years ago)
- Location:
- trunk/WebKit/wx
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/wx/ChangeLog
r32607 r32863 1 2008-05-04 Robin Dunn <robin@alldunn.com> 2 3 Reviewed by Kevin Ollivier. 4 5 Allow events to specify the ID of the particular wxWebView they are to be sent to. 6 7 https://bugs.webkit.org/show_bug.cgi?id=18659 8 9 * WebFrame.cpp: 10 (wxWebFrame::wxWebFrame): 11 * WebView.cpp: 12 (wxWebViewLoadEvent::wxWebViewLoadEvent): 13 (wxWebViewBeforeLoadEvent::wxWebViewBeforeLoadEvent): 14 (wxWebViewNewWindowEvent::wxWebViewNewWindowEvent): 15 (wxWebViewRightClickEvent::wxWebViewRightClickEvent): 16 (wxWebViewConsoleMessageEvent::wxWebViewConsoleMessageEvent): 17 * WebView.h: 18 * bindings/python/webview.i: 19 1 20 2008-04-27 Robin Dunn <robin@alldunn.com> 2 21 -
trunk/WebKit/wx/WebFrame.cpp
r29663 r32863 63 63 ID_BROWSE = wxID_HIGHEST + 15, 64 64 ID_EDIT = wxID_HIGHEST + 16, 65 ID_RUN_SCRIPT = wxID_HIGHEST + 17 65 ID_RUN_SCRIPT = wxID_HIGHEST + 17, 66 ID_WEBVIEW = wxID_HIGHEST + 18 66 67 }; 67 68 … … 72 73 EVT_TEXT_ENTER(ID_TEXTCTRL, wxWebFrame::OnAddressBarEnter) 73 74 EVT_TEXT_ENTER(ID_SEARCHCTRL, wxWebFrame::OnSearchCtrlEnter) 74 EVT_WEBVIEW_LOAD( wxWebFrame::OnLoadEvent)75 EVT_WEBVIEW_BEFORE_LOAD( wxWebFrame::OnBeforeLoad)75 EVT_WEBVIEW_LOAD(ID_WEBVIEW, wxWebFrame::OnLoadEvent) 76 EVT_WEBVIEW_BEFORE_LOAD(ID_WEBVIEW, wxWebFrame::OnBeforeLoad) 76 77 EVT_MENU(ID_BACK, wxWebFrame::OnBack) 77 78 EVT_MENU(ID_FORWARD, wxWebFrame::OnForward) … … 154 155 155 156 // Create the wxWebView Window 156 webview = new wxWebView((wxWindow*)this, 1001, wxDefaultPosition, wxSize(200, 200));157 webview = new wxWebView((wxWindow*)this, ID_WEBVIEW, wxDefaultPosition, wxSize(200, 200)); 157 158 webview->SetBackgroundColour(*wxWHITE); 158 159 -
trunk/WebKit/wx/WebView.cpp
r32607 r32863 98 98 SetEventType( wxEVT_WEBVIEW_LOAD); 99 99 SetEventObject( win ); 100 SetId(win->GetId()); 100 if (win) 101 SetId(win->GetId()); 101 102 } 102 103 … … 110 111 SetEventType(wxEVT_WEBVIEW_BEFORE_LOAD); 111 112 SetEventObject(win); 112 SetId(win->GetId()); 113 if (win) 114 SetId(win->GetId()); 113 115 } 114 116 … … 121 123 SetEventType(wxEVT_WEBVIEW_NEW_WINDOW); 122 124 SetEventObject(win); 123 SetId(win->GetId()); 125 if (win) 126 SetId(win->GetId()); 124 127 } 125 128 … … 132 135 SetEventType(wxEVT_WEBVIEW_RIGHT_CLICK); 133 136 SetEventObject(win); 134 SetId(win->GetId()); 137 if (win) 138 SetId(win->GetId()); 135 139 } 136 140 … … 143 147 SetEventType(wxEVT_WEBVIEW_CONSOLE_MESSAGE); 144 148 SetEventObject(win); 145 SetId(win->GetId()); 149 if (win) 150 SetId(win->GetId()); 146 151 } 147 152 -
trunk/WebKit/wx/WebView.h
r32607 r32863 318 318 #endif 319 319 320 #define EVT_WEBVIEW_LOAD( func)\320 #define EVT_WEBVIEW_LOAD(winid, func) \ 321 321 DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBVIEW_LOAD, \ 322 w xID_ANY, \322 winid, \ 323 323 wxID_ANY, \ 324 324 (wxObjectEventFunction) \ … … 326 326 static_cast<wxObject*>(NULL)), 327 327 328 #define EVT_WEBVIEW_BEFORE_LOAD( func)\328 #define EVT_WEBVIEW_BEFORE_LOAD(winid, func) \ 329 329 DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBVIEW_BEFORE_LOAD, \ 330 w xID_ANY, \330 winid, \ 331 331 wxID_ANY, \ 332 332 (wxObjectEventFunction) \ … … 334 334 static_cast<wxObject*>(NULL)), 335 335 336 #define EVT_WEBVIEW_NEW_WINDOW( func)\336 #define EVT_WEBVIEW_NEW_WINDOW(winid, func) \ 337 337 DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBVIEW_NEW_WINDOW, \ 338 w xID_ANY, \338 winid, \ 339 339 wxID_ANY, \ 340 340 (wxObjectEventFunction) \ … … 342 342 static_cast<wxObject*>(NULL)), 343 343 344 #define EVT_WEBVIEW_RIGHT_CLICK( func)\344 #define EVT_WEBVIEW_RIGHT_CLICK(winid, func) \ 345 345 DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBVIEW_RIGHT_CLICK, \ 346 w xID_ANY, \346 winid, \ 347 347 wxID_ANY, \ 348 348 (wxObjectEventFunction) \ … … 350 350 static_cast<wxObject*>(NULL)), 351 351 352 #define EVT_WEBVIEW_CONSOLE_MESSAGE( func)\352 #define EVT_WEBVIEW_CONSOLE_MESSAGE(winid, func) \ 353 353 DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBVIEW_CONSOLE_MESSAGE, \ 354 w xID_ANY, \354 winid, \ 355 355 wxID_ANY, \ 356 356 (wxObjectEventFunction) \ -
trunk/WebKit/wx/bindings/python/webview.i
r31667 r32863 48 48 %constant wxEventType wxEVT_WEBVIEW_NEW_WINDOW; 49 49 %constant wxEventType wxEVT_WEBVIEW_RIGHT_CLICK; 50 %constant wxEventType wxEVT_WEBVIEW_CONSOLE_MESSAGE; 50 51 51 52 %pythoncode { 52 EVT_WEBVIEW_BEFORE_LOAD = wx.PyEventBinder( wxEVT_WEBVIEW_BEFORE_LOAD ) 53 EVT_WEBVIEW_LOAD = wx.PyEventBinder( wxEVT_WEBVIEW_LOAD ) 54 EVT_WEBVIEW_NEW_WINDOW = wx.PyEventBinder( wxEVT_WEBVIEW_NEW_WINDOW ) 55 EVT_WEBVIEW_RIGHT_CLICK = wx.PyEventBinder( wxEVT_WEBVIEW_RIGHT_CLICK ) 53 EVT_WEBVIEW_BEFORE_LOAD = wx.PyEventBinder( wxEVT_WEBVIEW_BEFORE_LOAD, 1 ) 54 EVT_WEBVIEW_LOAD = wx.PyEventBinder( wxEVT_WEBVIEW_LOAD, 1 ) 55 EVT_WEBVIEW_NEW_WINDOW = wx.PyEventBinder( wxEVT_WEBVIEW_NEW_WINDOW, 1 ) 56 EVT_WEBVIEW_RIGHT_CLICK = wx.PyEventBinder( wxEVT_WEBVIEW_RIGHT_CLICK, 1 ) 57 EVT_WEBVIEW_CONSOLE_MESSAGE = wx.PyEventBinder( wxEVT_WEBVIEW_CONSOLE_MESSAGE, 1 ) 56 58 }
Note: See TracChangeset
for help on using the changeset viewer.