~ubuntu-branches/debian/sid/filezilla/sid

« back to all changes in this revision

Viewing changes to src/interface/dialogex.cpp

Committer: Bazaar Package Importer
Author(s): Adrien Cunin
Date: 2009-11-15 17:15:41 UTC
mfrom: (1.3.5 upstream) (4.1.6 sid)
Revision ID: james.westby@ubuntu.com-20091115171541-nvo6m3hl3iof0lnc

* New upstream release
* Updated previous changelog entry to mention desktop notifications as a new
feature

files added:
data/process_running.nsh

src/dbus/desktop_notification.cpp

src/dbus/desktop_notification.h

src/interface/resources/16x16/symlink.png

src/interface/welcome_dialog.cpp

src/interface/welcome_dialog.h

files modified:
AUTHORS

NEWS

README

configure

configure.in

data/Makefile.am

data/Makefile.in

data/install.nsi.in

data/mingwm10.dll

debian/changelog

debian/control

docs/filezilla.man

docs/iconspecs.htm

locales/ar.po

locales/bg_BG.po

locales/da_DK.po

locales/de.po

locales/el.po

locales/es.po

locales/et_EE.po

locales/fi_FI.po

locales/filezilla.pot

locales/fr.po

locales/hr.po

locales/id_ID.po

locales/it.po

locales/nl.po

locales/nn_NO.po

locales/oc.po

locales/pl_PL.po

locales/pt_PT.po

locales/ro_RO.po

locales/sv.po

locales/tr.po

locales/vi_VN.po

locales/zh_CN.po

locales/zh_TW.po

src/dbus/Makefile.am

src/dbus/Makefile.in

src/dbus/power_management_inhibitor.cpp

src/dbus/power_management_inhibitor.h

src/dbus/session_manager.cpp

src/dbus/wxdbusconnection.cpp

src/dbus/wxdbusmessage.cpp

src/dbus/wxdbusmessage.h

src/engine/directorycache.h

src/engine/directorylistingparser.cpp

src/engine/ftpcontrolsocket.cpp

src/engine/ftpcontrolsocket.h

src/engine/httpcontrolsocket.cpp

src/engine/local_path.cpp

src/engine/servercapabilities.h

src/engine/serverpath.cpp

src/engine/tlssocket.cpp

src/include/notification.h

src/interface/FileZilla.cpp

src/interface/LocalListView.cpp

src/interface/LocalTreeView.cpp

src/interface/LocalTreeView.h

src/interface/Mainfrm.cpp

src/interface/Mainfrm.h

src/interface/Makefile.am

src/interface/Makefile.in

src/interface/Options.cpp

src/interface/Options.h

src/interface/QueueView.cpp

src/interface/QueueView.h

src/interface/RemoteListView.cpp

src/interface/RemoteListView.h

src/interface/RemoteTreeView.cpp

src/interface/aui_notebook_ex.cpp

src/interface/aui_notebook_ex.h

src/interface/bookmarks_dialog.cpp

src/interface/buildinfo.cpp

src/interface/buildinfo.h

src/interface/clearprivatedata.cpp

src/interface/commandqueue.cpp

src/interface/commandqueue.h

src/interface/defaultfileexistsdlg.cpp

src/interface/dialogex.cpp

src/interface/dialogex.h

src/interface/dndobjects.cpp

src/interface/edithandler.cpp

src/interface/edithandler.h

src/interface/filelistctrl.cpp

src/interface/filelistctrl.h

src/interface/filter.cpp

src/interface/filter.h

src/interface/filter_conditions_dialog.cpp

src/interface/import.cpp

src/interface/interface.vcproj

src/interface/ipcmutex.cpp

src/interface/ipcmutex.h

src/interface/listctrlex.cpp

src/interface/listctrlex.h

src/interface/power_management.cpp

src/interface/power_management.h

src/interface/queue.cpp

src/interface/queue.h

src/interface/quickconnectbar.cpp

src/interface/quickconnectbar.h

src/interface/recentserverlist.cpp

src/interface/recursive_operation.cpp

src/interface/resources/16x16/Makefile.am

src/interface/resources/16x16/Makefile.in

src/interface/resources/dialogs.xrc

src/interface/resources/menus.xrc

src/interface/resources/settings.xrc

src/interface/search.cpp

src/interface/search.h

src/interface/settings/optionspage_connection.cpp

src/interface/settings/optionspage_fileexists.cpp

src/interface/settings/optionspage_fileexists.h

src/interface/settings/optionspage_interface.cpp

src/interface/settings/optionspage_transfer.cpp

src/interface/settings/settingsdialog.cpp

src/interface/sitemanager.cpp

src/interface/sitemanager.h

src/interface/state.cpp

src/interface/state.h

src/interface/statusbar.cpp

src/interface/statusbar.h

src/interface/statuslinectrl.cpp

src/interface/statuslinectrl.h

src/interface/systemimagelist.cpp

src/interface/systemimagelist.h

src/interface/updatewizard.cpp

src/interface/updatewizard.h

src/interface/verifycertdialog.cpp

src/interface/viewheader.cpp

src/interface/wrapengine.cpp

src/putty/cmdline.c

src/putty/sshsh512.c

src/putty/unix/uxnet.c

src/putty/unix/uxnoise.c

src/putty/windows/winnet.c

Show diffs side-by-side

added added

removed removed

src/interface/dialogex.cpp

EVT_CHAR_HOOK(wxDialogEx::OnChar)

END_EVENT_TABLE()

int wxDialogEx::m_shown_dialogs = 0;

void wxDialogEx::OnChar(wxKeyEvent& event)

{

if (event.GetKeyCode() == WXK_ESCAPE)

// Could happen during drag&drop with notification dialogs.

::ReleaseCapture();

#endif

return wxDialog::ShowModal();

m_shown_dialogs++;

int ret = wxDialog::ShowModal();

m_shown_dialogs--;

return ret;

}

bool wxDialogEx::ReplaceControl(wxWindow* old, wxWindow* wnd)

Older »