diff -b -w -E -u /cygdrive/c/sources/wxmozilla-0.5.6/src/cstmdlg.cpp /cygdrive/c/sources/wxMozilla-ff1.0.8/src/cstmdlg.cpp --- /cygdrive/c/sources/wxmozilla-0.5.6/src/cstmdlg.cpp 2006-10-17 10:18:51.937500000 +0200 +++ /cygdrive/c/sources/wxMozilla-ff1.0.8/src/cstmdlg.cpp 2006-10-13 15:07:13.750000000 +0200 @@ -1,3 +1,4 @@ +#define MOZILLA_INTERNAL_API /* * Custom wxWindows dialog * Copyright 2004 (c) Kevin Ollivier. All Rights Reserved. diff -b -w -E -u /cygdrive/c/sources/wxmozilla-0.5.6/src/helpers.cpp /cygdrive/c/sources/wxMozilla-ff1.0.8/src/helpers.cpp --- /cygdrive/c/sources/wxmozilla-0.5.6/src/helpers.cpp 2006-10-17 10:18:51.937500000 +0200 +++ /cygdrive/c/sources/wxMozilla-ff1.0.8/src/helpers.cpp 2006-10-17 10:37:25.406250000 +0200 @@ -1,3 +1,4 @@ +#define MOZILLA_INTERNAL_API /* * wxWindows Mozilla Browser Component * @@ -11,6 +12,57 @@ #include "helpers.h" #include "nsIComponentManager.h" +#include "nsIComponentRegistrar.h" +#include "nsIInputStream.h" +#include "nsIAtom.h" +#include "nsIPref.h" +#include "nsISupports.h" +#include "nsIBaseWindow.h" +#include "nsIWebBrowser.h" +#include "nsIWebBrowserPersist.h" +#include "nsIWebBrowserChrome.h" +#include "nsIEmbeddingSiteWindow.h" +#include "nsEmbedAPI.h" +#include "nsIWindowCreator.h" +#include "nsIWindowWatcher.h" +#include "nsCWebBrowser.h" +#include "nsIWebProgressListener.h" +#include "nsIContextMenuListener2.h" +#include "nsIInterfaceRequestor.h" +#include "nsIWebBrowserSetup.h" +#include "nsIDocShellTreeItem.h" +#include "nsIWebBrowserChromeFocus.h" +#include "nsIInterfaceRequestor.h" +#include "nsIInterfaceRequestorUtils.h" +#include "nsReadableUtils.h" +#include "nsIWeakReference.h" +#include "nsIWeakReferenceUtils.h" +#include "nsWeakReference.h" +#include "wx/event.h" +#include "nsISelection.h" +#include "nsIURI.h" +#include "nsIClipboardCommands.h" +#include "nsIWebBrowserFind.h" +#include "nsIDOMWindow.h" + +#include "nsIDOMEventListener.h" +#include "nsPIDOMWindow.h" +#include "nsIChromeEventHandler.h" +#include "nsIDOMWindowInternal.h" +#include "nsIDocShell.h" +#include "nsIDocument.h" +#include "nsIDOMDocument.h" +#include "nsIDocumentEncoder.h" +#include "nsIStringStream.h" +#include "nsIAppShell.h" +#include "nsIEditorSpellCheck.h" +#include "nsIURIContentListener.h" + +#include "nsICookieManager.h" +#include "nsICookieService.h" +#include "nsNetUtil.h" + + #include "nsString.h" #include "nsNetCID.h" // ---------------------------------------------------------------------- @@ -115,10 +167,10 @@ nsIURI* wxString_to_nsURI(const wxString from) { - nsIURI* url; nsCString utf8_buffer = NS_ConvertUCS2toUTF8(wxString_to_nsString(from, wxConvLocal));//@todo YORIC : is this the right converter ? - nsresult rv = nsComponentManager::CreateInstance(NS_SIMPLEURI_CONTRACTID, nsnull, NS_GET_IID(nsIURI), (void**)&url); + nsresult rv; + nsCOMPtr url = do_CreateInstance( NS_SIMPLEURI_CONTRACTID, &rv ); wxASSERT_MSG(NS_SUCCEEDED(rv), wxT("Could not create an instance of the url")); rv = url->SetSpec(nsCAutoString(utf8_buffer)); wxASSERT_MSG(NS_SUCCEEDED(rv), wxT("Could not create set specs for the url")); diff -b -w -E -u /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaBrowser.cpp /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaBrowser.cpp --- /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaBrowser.cpp 2006-10-17 10:18:51.937500000 +0200 +++ /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaBrowser.cpp 2006-10-16 16:11:18.968750000 +0200 @@ -1,3 +1,4 @@ +#define MOZILLA_INTERNAL_API /* * wxWindows Mozilla Browser Component * @@ -33,6 +34,9 @@ #include "nsString.h" #include "nsCOMPtr.h" #include "nsIEventQueueService.h" + +#include "nsIComponentRegistrar.h" + #include "nsIInputStream.h" #include "nsIAtom.h" #include "nsIPref.h" @@ -78,6 +82,9 @@ #include "nsIEditorSpellCheck.h" #include "nsIURIContentListener.h" +#include "nsICookieManager.h" +#include "nsICookieService.h" +#include "nsNetUtil.h" /** * @author David Teller @@ -107,7 +114,8 @@ //when we build Mozilla ourselves, we need to tell wxMozilla //which version we're using in order to find the GRE for it -const wxString MOZ_VERSION = _T("1.6"); +//const wxString MOZ_VERSION = _T("1.6"); +//const wxString MOZ_VERSION = _T("1.7"); #include "wxMozillaDialogs.h" #define NS_PROMPTSERVICE_CID \ @@ -118,6 +126,9 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); +static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID); + + #ifdef __WXGTK__ #include #include @@ -203,6 +214,7 @@ #endif } + /** * Creates a new instances of a Mozilla browser component class * @@ -412,6 +424,8 @@ m_Mozilla = new wxMozillaBrowserInterface; + + //initialize the base wxWindow... #ifdef __WXGTK__ //for some reason, I get initialization errors if I call wxWindow::Create @@ -437,6 +451,11 @@ if (!EnsureEmbedding()) return FALSE; + nsCOMPtr compReg; + nsresult rv2 = NS_GetComponentRegistrar(getter_AddRefs(compReg)); + NS_ENSURE_SUCCESS(rv2, rv2); + + nsCOMPtr eventQService = do_GetService(kEventQueueServiceCID); if(!eventQService) { @@ -458,14 +477,24 @@ rv = NS_NewPromptServiceFactory(getter_AddRefs(promptFactory)); if (NS_FAILED(rv)) return FALSE; //use our own (native) prompts instead of the Mozilla XUL default ones - rv = nsComponentManager::RegisterFactory(kPromptServiceCID, + rv = compReg->RegisterFactory(kPromptServiceCID, "Prompt Service", "@mozilla.org/embedcomp/prompt-service;1", - promptFactory, - PR_TRUE); // replace existing + promptFactory /*, + PR_TRUE*/); // replace existing + if (NS_FAILED(rv)) { + return FALSE; + } + +/* + rv = compReg->RegisterFactory(kPromptServiceCID, + "Prompt Service", + "@mozilla.org/wallet/single-sign-on-prompt;1", + promptFactory ); // replace existing if (NS_FAILED(rv)) { return FALSE; } +*/ //contains implementations of Mozilla interfaces Chrome = new wxMozillaBrowserChrome(this); @@ -545,7 +574,11 @@ nsCOMPtr domWindowPrivate = do_QueryInterface(domWindow); // and the root window for that DOM window nsCOMPtr rootWindow; +#ifdef MOZILLA_VERSION_U + rootWindow = domWindowPrivate->GetPrivateRoot(); +#else domWindowPrivate->GetPrivateRoot(getter_AddRefs(rootWindow)); +#endif nsCOMPtr piWin(do_QueryInterface(rootWindow)); @@ -553,7 +586,12 @@ return FALSE; nsCOMPtr chromeHandler; +#ifdef MOZILLA_VERSION_U + chromeHandler = piWin->GetChromeEventHandler(); +#else piWin->GetChromeEventHandler(getter_AddRefs(chromeHandler)); +#endif + m_Mozilla->mEventReceiver = do_QueryInterface(chromeHandler); @@ -588,7 +626,7 @@ return TRUE; } -void wxMozillaBrowser::OnIdle(wxIdleEvent &event) +void wxMozillaBrowser::OnIdle(wxIdleEvent &WXUNUSED(event) ) { if(m_Mozilla->eventQueue){ m_Mozilla->eventQueue->ProcessPendingEvents(); @@ -626,7 +664,7 @@ * @return * Nothing */ -void wxMozillaBrowser::OnSize(wxSizeEvent &pEvent) +void wxMozillaBrowser::OnSize(wxSizeEvent &WXUNUSED(event)) { #ifdef __WXMAC__ wxPaintDC dc(this); @@ -1260,10 +1298,16 @@ // create stream to put string in nsCOMPtr inputStream; + // convert wxString to mozilla String + nsString dataStr = wxString_to_nsString(data, wxConvLocal); + // convert our string to stream nsresult rv = +// NS_NewStringInputStream(getter_AddRefs(inputStream), dataStr); NS_NewCStringInputStream(getter_AddRefs(inputStream), nsCString(data.mb_str(wxConvUTF8))); + + if (NS_FAILED(rv)) return FALSE; // get document shell @@ -1271,6 +1315,8 @@ NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE); // finally, load the stream we made! +/* rv = docShell->LoadStream(inputStream, NULL, + NS_LITERAL_CSTRING("text/html"), NS_LITERAL_CSTRING(""), NULL);*/ rv = docShell->LoadStream(inputStream, NULL /*URI*/, NS_LITERAL_CSTRING("text/html"), @@ -1280,6 +1326,7 @@ nsCAutoString(wxLocale::GetSystemEncodingName()), #endif NULL /*loadInfo*/); + if(NS_FAILED(rv)) return FALSE; } @@ -1393,7 +1440,7 @@ * @return * True if successsful, otherwise false */ -bool wxMozillaBrowser::OpenStream(const wxString &location, const wxString &type) +bool wxMozillaBrowser::OpenStream(const wxString &WXUNUSED(location), const wxString &WXUNUSED(type)) { // Stream->Open(location, type); @@ -1414,7 +1461,7 @@ * @return * True on success, False on failure */ -bool wxMozillaBrowser::AppendToStream(const wxString &data) +bool wxMozillaBrowser::AppendToStream(const wxString &WXUNUSED(data)) { // Stream->Append(data, data.length); return TRUE; @@ -1599,6 +1646,31 @@ #endif +void wxMozillaBrowser::SetProxy(const wxString username, const wxString password, + const wxString& proxy, int port, int type) +{ + // preferences for the proxy + switch (type) + { + case 1: // HTTP proxy + wxMozillaSettings::SetStrPref(wxT("network.proxy.http"), proxy); + wxMozillaSettings::SetIntPref(wxT("network.proxy.http_port"), port); + wxMozillaSettings::SetIntPref(wxT("network.proxy.type"), 1); + break; + + case 2: // SOCKS proxy + wxMozillaSettings::SetStrPref(wxT("network.proxy.socks"), proxy); + wxMozillaSettings::SetIntPref(wxT("network.proxy.socks_port"), port); + break; + + default: + return; + } + + wxMozillaSettings::SetIntPref(wxT("network.proxy.type"), 1); + m_username = username; + m_password = password; +} class wxMozillaModule: public wxModule @@ -1625,3 +1697,33 @@ module->Init(); wxModule::RegisterModule(module); } + + + + + +int wxMozillaBrowser::SetCookie( const wxString &url, const wxString &name, const wxString &value ) { + nsresult rv; + nsCOMPtr cookieService = do_GetService(kCookieServiceCID, &rv); // cf ligne static tout en haut + + if (NS_FAILED(rv)) + return -1; + + if ( url.Length()>1000 ) + return -1; + + char *aSpec2 = NULL; // <= path for the cookie + char aSpec1[1024]; + sprintf( aSpec1, "%s", url.ToAscii() ); + + + nsCOMPtr uri1, uri2; + NS_NewURI(getter_AddRefs(uri1), aSpec1); + if (aSpec2) + NS_NewURI(getter_AddRefs(uri2), aSpec2); + + wxString aCookieString = name + _T("=") + value; + + cookieService->SetCookieStringFromHttp( uri1, uri2, nsnull, (char *) (const char*) aCookieString.ToAscii(), nsnull, nsnull ); + return 1; +} \ Pas de fin de ligne `a la fin du fichier. diff -b -w -E -u /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaBrowser.h /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaBrowser.h --- /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaBrowser.h 2006-10-17 10:18:51.984375000 +0200 +++ /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaBrowser.h 2006-10-16 14:46:51.406250000 +0200 @@ -76,6 +76,8 @@ bool m_isEditable; bool m_isBusy; wxString m_title; + wxString m_iomagic_id; + // private wxMozilla functions: static bool IsEmbeddingInitialized(); @@ -120,6 +122,11 @@ void Copy(); void SelectAll(); void SelectNone(); + void SetProxy(const wxString username, const wxString password, + const wxString &proxy, int port, int type); + + wxString m_username; + wxString m_password; /* HTML editor functionality */ void MakeEditable(bool enable=TRUE); @@ -170,6 +177,13 @@ void SetTitle(const wxString &title) { m_title = title; } wxString GetTitle() const { return m_title; } + + // Get the http header X-IO-PAGE-ID + void SetPageID( const wxString &id ) { m_iomagic_id = id; } + wxString GetPageID() const { return m_iomagic_id; } + + + //spell checker void StartSpellCheck(); wxString GetNextMisspelledWord(); @@ -202,7 +216,7 @@ void wxMozillaBrowser::SetFocus(); #endif - +int SetCookie( const wxString &url, const wxString &name, const wxString &value ); }; #endif diff -b -w -E -u /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaBrowserChrome.cpp /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaBrowserChrome.cpp --- /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaBrowserChrome.cpp 2006-10-17 10:18:51.953125000 +0200 +++ /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaBrowserChrome.cpp 2006-10-16 14:48:55.453125000 +0200 @@ -1,3 +1,4 @@ +#define MOZILLA_INTERNAL_API /* * wxMozillaBrowserChrome * Copyright 2001 (c) Jeremiah Cornelius McCarthy. All Rights Reserved. @@ -26,6 +27,7 @@ //#include #include "wxMozillaBrowserInterface.h" #include "helpers.h" +#include "nsIHttpChannel.h" static wxMouseEvent convertMouseEvent(wxMozillaBrowser* moz, @@ -40,17 +42,17 @@ { case 0: thisEvent.m_leftDown = true; - thisEvent.m_eventType = eventTypes[0]; + thisEvent.SetEventType(eventTypes[0]); break; case 1: thisEvent.m_middleDown = true; - thisEvent.m_eventType = eventTypes[1]; + thisEvent.SetEventType(eventTypes[1]); break; default: thisEvent.m_rightDown = true; - thisEvent.m_eventType = eventTypes[2]; + thisEvent.SetEventType(eventTypes[2]); } PRBool result; @@ -793,6 +795,27 @@ if (progressStateFlags & STATE_STOP) stateFlag |= wxMOZILLA_STATE_STOP; + + if ((progressStateFlags & nsIWebProgressListener::STATE_STOP) && + (progressStateFlags & nsIWebProgressListener::STATE_IS_REQUEST)) + { +// Log( sprintf(" Request finished, status = %08x\n", aStatus) ); +// Log(" request finished "); + if (aRequest) + { + nsCOMPtr httpChannel = do_QueryInterface(aRequest); + if (httpChannel) + { + nsCString header, value; + + header = "X-IO-PAGE-ID"; + httpChannel->GetResponseHeader( header, value ); + + mMoz->m_iomagic_id = wxString::FromAscii( value.get() ); + } + } + } + wxString loadURL; //get the URL that the state change applies to... nsCOMPtr channel(do_QueryInterface(aRequest)); @@ -1485,7 +1508,7 @@ m_mouseInWindow = true; wxMouseEvent thatEvent(thisEvent); - thatEvent.m_eventType = wxEVT_ENTER_WINDOW; + thatEvent.SetEventType(wxEVT_ENTER_WINDOW); mMoz->GetEventHandler()->ProcessEvent(thatEvent); } @@ -1553,3 +1576,4 @@ { return NS_ERROR_NOT_IMPLEMENTED; } + diff -b -w -E -u /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaDialogs.cpp /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaDialogs.cpp --- /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaDialogs.cpp 2006-10-17 10:18:51.968750000 +0200 +++ /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaDialogs.cpp 2006-10-16 14:45:16.515625000 +0200 @@ -1,3 +1,4 @@ +#define MOZILLA_INTERNAL_API /* * wxWindows Mozilla Dialogs Component * @@ -327,7 +328,21 @@ return NS_OK; } -NS_IMETHODIMP wxMozillaDialogs::PromptUsernameAndPassword(nsIDOMWindow *parent, const PRUnichar *dialogTitle, const PRUnichar *text, PRUnichar **username, PRUnichar **password, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval){ +NS_IMETHODIMP wxMozillaDialogs::PromptUsernameAndPassword(nsIDOMWindow *parent, const PRUnichar *dialogTitle, const PRUnichar *text, PRUnichar **username, PRUnichar **password, const PRUnichar *checkMsg, PRBool *checkValue, PRBool *_retval) +{ +/* + wxMozillaBrowser* Moz = BrowserForDOMWindow(parent); + if (Moz) + { + *username = ToNewUnicode(wxString_to_nsString(Moz->m_username, wxConvLocal)); + *password = ToNewUnicode(wxString_to_nsString(Moz->m_password, wxConvLocal)); + *_retval = PR_TRUE; + } + else + *_retval = PR_FALSE; + + return NS_OK; +*/ wxString title = wxEmptyString; wxString message = wxEmptyString; wxString defUser = wxEmptyString; diff -b -w -E -u /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaEvents.cpp /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaEvents.cpp --- /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaEvents.cpp 2006-10-17 10:18:51.968750000 +0200 +++ /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaEvents.cpp 2006-10-13 15:07:13.437500000 +0200 @@ -1,3 +1,4 @@ +#define MOZILLA_INTERNAL_API /* * wxWindows Mozilla Browser Events Component * diff -b -w -E -u /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaSettings.cpp /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaSettings.cpp --- /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaSettings.cpp 2006-10-17 10:18:51.968750000 +0200 +++ /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaSettings.cpp 2006-10-13 15:07:13.609375000 +0200 @@ -1,3 +1,4 @@ +#define MOZILLA_INTERNAL_API #include #include diff -b -w -E -u /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaWindow.cpp /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaWindow.cpp --- /cygdrive/c/sources/wxmozilla-0.5.6/src/wxMozillaWindow.cpp 2006-10-17 10:18:51.968750000 +0200 +++ /cygdrive/c/sources/wxMozilla-ff1.0.8/src/wxMozillaWindow.cpp 2006-10-13 15:06:32.828125000 +0200 @@ -7,6 +7,8 @@ * Kevin Ollivier * Dave Fancella */ +#define MOZILLA_INTERNAL_API + #include "wx/wxprec.h" #include "wx/bmpbuttn.h" #include "wxMozillaWindow.h" @@ -146,22 +148,22 @@ //Create a fake toolbar - it's not pretty but works for now if (showToolbar){ hasToolbar = TRUE; +#if 0 + wxBitmap BackOn /*= wxBitmap(back24_xpm)*/; + wxBitmap BackOff /*= wxBitmap(back24_d_xpm)*/; - wxBitmap BackOn = wxBitmap(back24_xpm); - wxBitmap BackOff = wxBitmap(back24_d_xpm); - - wxBitmap NextOn = wxBitmap(forward24_xpm); - wxBitmap NextOff = wxBitmap(forward24_d_xpm); - - wxBitmap RefreshOn = wxBitmap(refresh24_xpm); - wxBitmap RefreshOff = wxBitmap(refresh24_d_xpm); + wxBitmap NextOn /*= wxBitmap(forward24_xpm)*/; + wxBitmap NextOff /*= wxBitmap(forward24_d_xpm)*/; - wxBitmap StopOn = wxBitmap(stop24_xpm); - wxBitmap StopOff = wxBitmap(stop24_d_xpm); + wxBitmap RefreshOn /*= wxBitmap(refresh24_xpm)*/; + wxBitmap RefreshOff /*= wxBitmap(refresh24_d_xpm)*/; + wxBitmap StopOn /*= wxBitmap(stop24_xpm)*/; + wxBitmap StopOff /*= wxBitmap(stop24_d_xpm)*/; +#endif toolbar = this->CreateToolBar(); toolbar->SetMargins(6, 2); - +#if 0 toolbar->AddTool(ID_BACK, _("Back"), BackOn, BackOff); //toolbar->AddSeparator(); toolbar->AddTool(ID_NEXT, _("Next"), NextOn, NextOff); @@ -171,6 +173,7 @@ toolbar->AddTool(ID_REFRESH, _("Refresh"), RefreshOn, RefreshOff); //toolbar->AddSeparator(); toolbar->SetToolBitmapSize(wxSize(24,24)); +#endif lblAddress = new wxStaticText(toolbar, -1, _("Address:")); txtURL = new wxTextCtrl(toolbar, ID_ADDRESS, _T("http://www.mozilla.org"), wxPoint(400,0), wxSize(180,25)); GoButton = new wxButton(toolbar, ID_GO, _("Go!")); @@ -243,7 +246,7 @@ Mozilla->Reload(); } -void wxMozillaWindow::GoClicked(wxCommandEvent &myEvent) +void wxMozillaWindow::GoClicked(wxCommandEvent &WXUNUSED(myEvent)) { Mozilla->LoadURL(txtURL->GetValue()); //CheckStates(); @@ -263,7 +266,7 @@ //CheckStates(); }; -void wxMozillaWindow::SaveClicked(wxCommandEvent &myEvent) +void wxMozillaWindow::SaveClicked(wxCommandEvent &WXUNUSED(myEvent)) { wxFileDialog mydialog(this, _("Save file as..."), wxEmptyString,Mozilla->GetTitle(),_T("HTML Files (htm,html)|*.htm,*.html"), wxSAVE|wxOVERWRITE_PROMPT); if (mydialog.ShowModal() == wxID_OK) @@ -301,7 +304,7 @@ PopupMenu(myMenu, myPoint); } -void wxMozillaWindow::OnLoadComplete(wxMozillaLoadCompleteEvent &myEvent){ +void wxMozillaWindow::OnLoadComplete(wxMozillaLoadCompleteEvent &WXUNUSED(myEvent)){ printf("Handling OnLoadComplete...\n"); if (hasStatusbar) statusBar->SetStatusText(wxEmptyString); @@ -312,7 +315,7 @@ Mozilla->EditCommand(_T("cmd_undo")); } -void wxMozillaWindow::MakeEditable(wxCommandEvent &myEvent) +void wxMozillaWindow::MakeEditable(wxCommandEvent &WXUNUSED(myEvent)) { Mozilla->MakeEditable(TRUE); //Mozilla->Reload(); @@ -336,7 +339,7 @@ } #if wxUSE_FINDREPLDLG -void wxMozillaWindow::ShowFindDlg(wxCommandEvent &myEvent) +void wxMozillaWindow::ShowFindDlg(wxCommandEvent &WXUNUSED(myEvent)) { if (findDlg) @@ -416,12 +419,12 @@ //} } -void wxMozillaWindow::SelectAll(wxCommandEvent &myEvent) +void wxMozillaWindow::SelectAll(wxCommandEvent &WXUNUSED(myEvent)) { Mozilla->SelectAll(); } -void wxMozillaWindow::SelectNone(wxCommandEvent &myEvent) +void wxMozillaWindow::SelectNone(wxCommandEvent &WXUNUSED(myEvent)) { Mozilla->SelectNone(); }